From 3076ab0d2a099eb426f31f4e0157bd58546b5e55 Mon Sep 17 00:00:00 2001 From: jerome Morissard Date: Sat, 15 Mar 2014 11:18:08 +0100 Subject: [PATCH] Refactor + localization enable --- .../project.pbxproj | 81 +++++++++++++++++ .../contents.xcworkspacedata | 7 ++ .../GenericPickerManager.xccheckout | 41 +++++++++ .../UserInterfaceState.xcuserstate | Bin 0 -> 23555 bytes .../xcdebugger/Breakpoints_v2.xcbkptlist | 5 + .../xcschemes/GenericPickerManager.xcscheme | 86 ++++++++++++++++++ .../MediaPickerManagerBundle.xcscheme | 59 ++++++++++++ .../xcschemes/xcschememanagement.plist | 32 +++++++ .../GenericPickerManager/JMOViewController.m | 12 ++- .../en.lproj/MediaPickerManager.strings | 20 ++++ .../fr.lproj/MediaPickerManager.strings | 19 ++++ .../MediaPickerManager/MediaPickerManager.h | 22 ++--- .../MediaPickerManager/MediaPickerManager.m | 72 ++++++++------- .../en.lproj/MediaPickerManager.strings | 19 ++++ .../fr.lproj/MediaPickerManager.strings | 19 ++++ MediaPickerManager.podspec | 4 +- pods.spec | 17 ---- 17 files changed, 448 insertions(+), 67 deletions(-) create mode 100644 GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/xcshareddata/GenericPickerManager.xccheckout create mode 100644 GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/xcuserdata/jeromemorissard.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist create mode 100644 GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/GenericPickerManager.xcscheme create mode 100644 GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/MediaPickerManagerBundle.xcscheme create mode 100644 GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/en.lproj/MediaPickerManager.strings create mode 100644 GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/fr.lproj/MediaPickerManager.strings create mode 100644 GenericPickerManager/MediaPickerManager/en.lproj/MediaPickerManager.strings create mode 100644 GenericPickerManager/MediaPickerManager/fr.lproj/MediaPickerManager.strings delete mode 100644 pods.spec diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/project.pbxproj b/GenericPickerManager/GenericPickerManager.xcodeproj/project.pbxproj index 13e7679..b2c6bee 100644 --- a/GenericPickerManager/GenericPickerManager.xcodeproj/project.pbxproj +++ b/GenericPickerManager/GenericPickerManager.xcodeproj/project.pbxproj @@ -6,6 +6,20 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + C2BCDFB618D45A2C00A4E86B /* MediaPickerManagerBundle */ = { + isa = PBXAggregateTarget; + buildConfigurationList = C2BCDFB718D45A2C00A4E86B /* Build configuration list for PBXAggregateTarget "MediaPickerManagerBundle" */; + buildPhases = ( + C2BCDFBA18D45A6100A4E86B /* ShellScript */, + ); + dependencies = ( + ); + name = MediaPickerManagerBundle; + productName = MediaPickerManagerBundle; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ C205EF1B17BD650F0023B227 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C205EF1A17BD650F0023B227 /* UIKit.framework */; }; C205EF1D17BD650F0023B227 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C205EF1C17BD650F0023B227 /* Foundation.framework */; }; @@ -20,6 +34,9 @@ C205EF3717BD650F0023B227 /* JMOViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = C205EF3517BD650F0023B227 /* JMOViewController_iPhone.xib */; }; C205EF3A17BD650F0023B227 /* JMOViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = C205EF3817BD650F0023B227 /* JMOViewController_iPad.xib */; }; C205EF4317BD65620023B227 /* MediaPickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C205EF4217BD65620023B227 /* MediaPickerManager.m */; }; + C2BCDFAC18D450F400A4E86B /* MediaPickerManager.strings in Resources */ = {isa = PBXBuildFile; fileRef = C2BCDFAE18D450F400A4E86B /* MediaPickerManager.strings */; }; + C2BCDFB518D4561800A4E86B /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2BCDFB418D4561700A4E86B /* MobileCoreServices.framework */; }; + C2BCDFBC18D45BA400A4E86B /* MediaPickerManager.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C2BCDFBB18D45BA400A4E86B /* MediaPickerManager.bundle */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -42,6 +59,12 @@ C205EF3917BD650F0023B227 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/JMOViewController_iPad.xib; sourceTree = ""; }; C205EF4117BD65620023B227 /* MediaPickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPickerManager.h; sourceTree = ""; }; C205EF4217BD65620023B227 /* MediaPickerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaPickerManager.m; sourceTree = ""; }; + C2BCDFAD18D450F400A4E86B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MediaPickerManager.strings; sourceTree = ""; }; + C2BCDFAF18D4511900A4E86B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MediaPickerManager.strings; sourceTree = ""; }; + C2BCDFB018D455F100A4E86B /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; + C2BCDFB218D455FC00A4E86B /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; }; + C2BCDFB418D4561700A4E86B /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; + C2BCDFBB18D45BA400A4E86B /* MediaPickerManager.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = MediaPickerManager.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,6 +72,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C2BCDFB518D4561800A4E86B /* MobileCoreServices.framework in Frameworks */, C205EF1B17BD650F0023B227 /* UIKit.framework in Frameworks */, C205EF1D17BD650F0023B227 /* Foundation.framework in Frameworks */, C205EF1F17BD650F0023B227 /* CoreGraphics.framework in Frameworks */, @@ -78,6 +102,9 @@ C205EF1917BD650F0023B227 /* Frameworks */ = { isa = PBXGroup; children = ( + C2BCDFB418D4561700A4E86B /* MobileCoreServices.framework */, + C2BCDFB218D455FC00A4E86B /* CoreImage.framework */, + C2BCDFB018D455F100A4E86B /* ImageIO.framework */, C205EF4017BD65620023B227 /* MediaPickerManager */, C205EF1A17BD650F0023B227 /* UIKit.framework */, C205EF1C17BD650F0023B227 /* Foundation.framework */, @@ -117,6 +144,8 @@ C205EF4017BD65620023B227 /* MediaPickerManager */ = { isa = PBXGroup; children = ( + C2BCDFBB18D45BA400A4E86B /* MediaPickerManager.bundle */, + C2BCDFAE18D450F400A4E86B /* MediaPickerManager.strings */, C205EF4117BD65620023B227 /* MediaPickerManager.h */, C205EF4217BD65620023B227 /* MediaPickerManager.m */, ); @@ -159,6 +188,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + fr, ); mainGroup = C205EF0E17BD650F0023B227; productRefGroup = C205EF1817BD650F0023B227 /* Products */; @@ -166,6 +196,7 @@ projectRoot = ""; targets = ( C205EF1617BD650F0023B227 /* GenericPickerManager */, + C2BCDFB618D45A2C00A4E86B /* MediaPickerManagerBundle */, ); }; /* End PBXProject section */ @@ -177,7 +208,9 @@ files = ( C205EF2517BD650F0023B227 /* InfoPlist.strings in Resources */, C205EF2D17BD650F0023B227 /* Default.png in Resources */, + C2BCDFBC18D45BA400A4E86B /* MediaPickerManager.bundle in Resources */, C205EF2F17BD650F0023B227 /* Default@2x.png in Resources */, + C2BCDFAC18D450F400A4E86B /* MediaPickerManager.strings in Resources */, C205EF3117BD650F0023B227 /* Default-568h@2x.png in Resources */, C205EF3717BD650F0023B227 /* JMOViewController_iPhone.xib in Resources */, C205EF3A17BD650F0023B227 /* JMOViewController_iPad.xib in Resources */, @@ -186,6 +219,22 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + C2BCDFBA18D45A6100A4E86B /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\necho \"Building bundle.\"\nif [ -d ./MediaPickerManager/MediaPickerManager.bundle ]; then\n rm ./MediaPickerManager/MediaPickerManager.bundle\nelse\n mkdir ./MediaPickerManager/MediaPickerManager.bundle\nfi\ncp -r ./MediaPickerManager/en.lproj ./MediaPickerManager/MediaPickerManager.bundle\ncp -r ./MediaPickerManager/fr.lproj ./MediaPickerManager/MediaPickerManager.bundle"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ C205EF1317BD650F0023B227 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -225,6 +274,15 @@ name = JMOViewController_iPad.xib; sourceTree = ""; }; + C2BCDFAE18D450F400A4E86B /* MediaPickerManager.strings */ = { + isa = PBXVariantGroup; + children = ( + C2BCDFAD18D450F400A4E86B /* en */, + C2BCDFAF18D4511900A4E86B /* fr */, + ); + name = MediaPickerManager.strings; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -308,6 +366,20 @@ }; name = Release; }; + C2BCDFB818D45A2C00A4E86B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + C2BCDFB918D45A2C00A4E86B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -327,6 +399,15 @@ C205EF3F17BD650F0023B227 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C2BCDFB718D45A2C00A4E86B /* Build configuration list for PBXAggregateTarget "MediaPickerManagerBundle" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C2BCDFB818D45A2C00A4E86B /* Debug */, + C2BCDFB918D45A2C00A4E86B /* Release */, + ); + defaultConfigurationIsVisible = 0; }; /* End XCConfigurationList section */ }; diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..c910c40 --- /dev/null +++ b/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/xcshareddata/GenericPickerManager.xccheckout b/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/xcshareddata/GenericPickerManager.xccheckout new file mode 100644 index 0000000..8e4b482 --- /dev/null +++ b/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/xcshareddata/GenericPickerManager.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + EDAF04B4-837D-41EC-86EC-A879A364A415 + IDESourceControlProjectName + GenericPickerManager + IDESourceControlProjectOriginsDictionary + + EA19B65B-F31D-4B1E-8343-BB684E7B679D + https://github.com/leverdeterre/MediaPickerManager.git + + IDESourceControlProjectPath + GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + EA19B65B-F31D-4B1E-8343-BB684E7B679D + ../../.. + + IDESourceControlProjectURL + https://github.com/leverdeterre/MediaPickerManager.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + EA19B65B-F31D-4B1E-8343-BB684E7B679D + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + EA19B65B-F31D-4B1E-8343-BB684E7B679D + IDESourceControlWCCName + MediaPickerManager + + + + diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/xcuserdata/jeromemorissard.xcuserdatad/UserInterfaceState.xcuserstate b/GenericPickerManager/GenericPickerManager.xcodeproj/project.xcworkspace/xcuserdata/jeromemorissard.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..f78eb503e4fc9460b36a022cee4a021998d9ff7c GIT binary patch literal 23555 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 literal 0 HcmV?d00001 diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..fe2b454 --- /dev/null +++ b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,5 @@ + + + diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/GenericPickerManager.xcscheme b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/GenericPickerManager.xcscheme new file mode 100644 index 0000000..4d8d71a --- /dev/null +++ b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/GenericPickerManager.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/MediaPickerManagerBundle.xcscheme b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/MediaPickerManagerBundle.xcscheme new file mode 100644 index 0000000..e02b9d7 --- /dev/null +++ b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/MediaPickerManagerBundle.xcscheme @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/xcschememanagement.plist b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..1b728d9 --- /dev/null +++ b/GenericPickerManager/GenericPickerManager.xcodeproj/xcuserdata/jeromemorissard.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,32 @@ + + + + + SchemeUserState + + GenericPickerManager.xcscheme + + orderHint + 0 + + MediaPickerManagerBundle.xcscheme + + orderHint + 1 + + + SuppressBuildableAutocreation + + C205EF1617BD650F0023B227 + + primary + + + C2BCDFB618D45A2C00A4E86B + + primary + + + + + diff --git a/GenericPickerManager/GenericPickerManager/JMOViewController.m b/GenericPickerManager/GenericPickerManager/JMOViewController.m index dced276..3e8d48e 100644 --- a/GenericPickerManager/GenericPickerManager/JMOViewController.m +++ b/GenericPickerManager/GenericPickerManager/JMOViewController.m @@ -27,26 +27,28 @@ - (void)didReceiveMemoryWarning } -- (IBAction)photoSelected:(id)sender { +- (IBAction)photoSelected:(id)sender +{ [MediaPickerManager sharedInstance].type = JMMediaTypePhotos; [MediaPickerManager sharedInstance].delegate = self; - [[MediaPickerManager sharedInstance] photoSelected:sender]; + [[MediaPickerManager sharedInstance] presentPhotosFrom:sender]; NSLog(@"[MediaPickerManager sharedInstance] -> %@",[MediaPickerManager sharedInstance]); } -- (IBAction)videoSelected:(id)sender { +- (IBAction)videoSelected:(id)sender +{ [MediaPickerManager sharedInstance].type = JMMediaTypeVideos; [MediaPickerManager sharedInstance].delegate = self; - [[MediaPickerManager sharedInstance] videoSelected:sender]; + [[MediaPickerManager sharedInstance] presentVideosFrom:sender]; NSLog(@"[MediaPickerManager sharedInstance] -> %@",[MediaPickerManager sharedInstance]); } #pragma marJMMMediaPickerManagerDelegate -- (void)bkImagePickerControllerDidFinishPickingMediaWithInfo:(NSDictionary *)info +- (void)imagePickerControllerDidFinishPickingMediaWithInfo:(NSDictionary *)info { NSLog(@"%s",__FUNCTION__); diff --git a/GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/en.lproj/MediaPickerManager.strings b/GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/en.lproj/MediaPickerManager.strings new file mode 100644 index 0000000..f60a4d9 --- /dev/null +++ b/GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/en.lproj/MediaPickerManager.strings @@ -0,0 +1,20 @@ + +/* + MediaPickerManager.strings + GenericPickerManager + + Created by Jerome Morissard on 3/15/14. + Copyright (c) 2014 Jerome Morissard. All rights reserved. +*/ + +"MediaPickerManager.cancel" = "Cancel"; +"MediaPickerManager.close" = "Close"; +"MediaPickerManager.take.photo" = "Take a picture"; +"MediaPickerManager.from.library" = "From the galery"; +"MediaPickerManager.take.video" = "Take a video"; + +//Erreur +"MediaPickerManager.video.error" = "This device can't take videos"; +"MediaPickerManager.photo.error" = "This device can't take pictures"; +"MediaPickerManager.gallery.error" = "This device doesn't has a gelery"; +"MediaPickerManager.error.title" = "Error"; \ No newline at end of file diff --git a/GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/fr.lproj/MediaPickerManager.strings b/GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/fr.lproj/MediaPickerManager.strings new file mode 100644 index 0000000..7a2d379 --- /dev/null +++ b/GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle/fr.lproj/MediaPickerManager.strings @@ -0,0 +1,19 @@ +/* + MediaPickerManager.strings + GenericPickerManager + + Created by Jerome Morissard on 3/15/14. + Copyright (c) 2014 Jerome Morissard. All rights reserved. +*/ + +"MediaPickerManager.cancel" = "Annuler"; +"MediaPickerManager.close" = "Fermer"; +"MediaPickerManager.take.photo" = "Prendre photo"; +"MediaPickerManager.from.library" = "De la bibliothèque"; +"MediaPickerManager.take.video" = "Prendre une vidéo"; + +//Erreur +"MediaPickerManager.video.error" = "Cet appareil ne peut pas prendre de vidéos"; +"MediaPickerManager.photo.error" = "Cet appareil ne peut pas prendre de photos"; +"MediaPickerManager.gallery.error" = "Cet appareil n'a pas de galerie"; +"MediaPickerManager.error.title" = "Erreur"; \ No newline at end of file diff --git a/GenericPickerManager/MediaPickerManager/MediaPickerManager.h b/GenericPickerManager/MediaPickerManager/MediaPickerManager.h index dea4f41..9602c04 100755 --- a/GenericPickerManager/MediaPickerManager/MediaPickerManager.h +++ b/GenericPickerManager/MediaPickerManager/MediaPickerManager.h @@ -7,7 +7,8 @@ #import -typedef enum { + +typedef NS_OPTIONS(NSInteger, JMMediaType) { JMMediaTypeCameraPhoto = 0, JMMediaTypeCameraVideo = 1 << 0, JMMediaTypeLibraryPhoto = 1 << 1, @@ -17,18 +18,18 @@ typedef enum { JMMediaTypePhotos = JMMediaTypeCameraPhoto | JMMediaTypeLibraryPhoto, JMMediaTypeVideos = JMMediaTypeCameraVideo | JMMediaTypeLibraryVideo, JMMediaTypeAll = JMMediaTypeCamera | JMMediaTypeLibrary, -} JMMediaType; +}; -typedef enum { - JMMediaPresentationStylePresentModal = 0, - JMMediaPresentationStyleAddSubView = 1, - JMMediaPresentationStyleCustom = 2 -} JMMediaPresentationStyle; +typedef NS_ENUM(NSInteger, JMMediaPresentationStyle) { + JMMediaPresentationStylePresentModal, + JMMediaPresentationStyleAddSubView, + JMMediaPresentationStyleCustom +}; @protocol JMMediaPickerManagerDelegate -- (void)bkImagePickerControllerDidFinishPickingMediaWithInfo:(NSDictionary *)info; +- (void)imagePickerControllerDidFinishPickingMediaWithInfo:(NSDictionary *)info; @optional - (void)customPresentImagePicker:(UIViewController *)controller; - (void)customDismissImagePicker:(UIViewController *)controller; @@ -43,8 +44,7 @@ typedef enum { + (instancetype)sharedInstance; -- (IBAction)photoSelected:(id)sender; -- (IBAction)videoSelected:(id)sender; -- (void)presentImagePickerWithSourceType:(UIImagePickerControllerSourceType)sourceType andTypes:(NSArray *)arrayOfTypes; +- (void)presentPhotosFrom:(id)sender; +- (void)presentVideosFrom:(id)sender; @end diff --git a/GenericPickerManager/MediaPickerManager/MediaPickerManager.m b/GenericPickerManager/MediaPickerManager/MediaPickerManager.m index 7e74322..d5a9898 100755 --- a/GenericPickerManager/MediaPickerManager/MediaPickerManager.m +++ b/GenericPickerManager/MediaPickerManager/MediaPickerManager.m @@ -17,7 +17,8 @@ @interface MediaPickerManager () %d\n",JMMediaTypeCameraPhoto]; - [str appendFormat:@"JMMediaTypeCameraVideo -> %d\n",JMMediaTypeCameraVideo]; - [str appendFormat:@"JMMediaTypeLibraryPhoto -> %d\n",JMMediaTypeLibraryPhoto]; - [str appendFormat:@"JMMediaTypeLibraryVideo -> %d\n",JMMediaTypeLibraryVideo]; - [str appendFormat:@"JMMediaTypeCamera -> %d\n",JMMediaTypeCamera]; - [str appendFormat:@"JMMediaTypeLibrary -> %d\n",JMMediaTypeLibrary]; - [str appendFormat:@"JMMediaTypePhotos -> %d\n",JMMediaTypePhotos]; - [str appendFormat:@"JMMediaTypeAll -> %d\n",JMMediaTypeAll]; - [str appendFormat:@"#SELECTED TYPE: %d\n", self.type]; - - return str; -} - diff --git a/GenericPickerManager/MediaPickerManager/en.lproj/MediaPickerManager.strings b/GenericPickerManager/MediaPickerManager/en.lproj/MediaPickerManager.strings new file mode 100644 index 0000000..842fdf3 --- /dev/null +++ b/GenericPickerManager/MediaPickerManager/en.lproj/MediaPickerManager.strings @@ -0,0 +1,19 @@ +/* + MediaPickerManager.strings + GenericPickerManager + + Created by Jerome Morissard on 3/15/14. + Copyright (c) 2014 Jerome Morissard. All rights reserved. +*/ + +"MediaPickerManager.cancel" = "Cancel"; +"MediaPickerManager.close" = "Close"; +"MediaPickerManager.take.photo" = "Take a picture"; +"MediaPickerManager.from.library" = "From the galery"; +"MediaPickerManager.take.video" = "Take a video"; + +//Erreur +"MediaPickerManager.video.error" = "This device can't take videos"; +"MediaPickerManager.photo.error" = "This device can't take pictures"; +"MediaPickerManager.gallery.error" = "This device doesn't has a gelery"; +"MediaPickerManager.error.title" = "Error"; \ No newline at end of file diff --git a/GenericPickerManager/MediaPickerManager/fr.lproj/MediaPickerManager.strings b/GenericPickerManager/MediaPickerManager/fr.lproj/MediaPickerManager.strings new file mode 100644 index 0000000..7a2d379 --- /dev/null +++ b/GenericPickerManager/MediaPickerManager/fr.lproj/MediaPickerManager.strings @@ -0,0 +1,19 @@ +/* + MediaPickerManager.strings + GenericPickerManager + + Created by Jerome Morissard on 3/15/14. + Copyright (c) 2014 Jerome Morissard. All rights reserved. +*/ + +"MediaPickerManager.cancel" = "Annuler"; +"MediaPickerManager.close" = "Fermer"; +"MediaPickerManager.take.photo" = "Prendre photo"; +"MediaPickerManager.from.library" = "De la bibliothèque"; +"MediaPickerManager.take.video" = "Prendre une vidéo"; + +//Erreur +"MediaPickerManager.video.error" = "Cet appareil ne peut pas prendre de vidéos"; +"MediaPickerManager.photo.error" = "Cet appareil ne peut pas prendre de photos"; +"MediaPickerManager.gallery.error" = "Cet appareil n'a pas de galerie"; +"MediaPickerManager.error.title" = "Erreur"; \ No newline at end of file diff --git a/MediaPickerManager.podspec b/MediaPickerManager.podspec index 52eb3f3..eec675d 100644 --- a/MediaPickerManager.podspec +++ b/MediaPickerManager.podspec @@ -11,7 +11,9 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/leverdeterre/MediaPickerManager' s.source = { :git => 'https://github.com/leverdeterre/MediaPickerManager.git', - :tag => "0.0.1" + :tag => “0.0.1” } s.source_files = 'GenericPickerManager/MediaPickerManager/*.{h,m}' + s.frameworks = 'MobileCoreServices' + s.resources = 'GenericPickerManager/MediaPickerManager/MediaPickerManager.bundle' end diff --git a/pods.spec b/pods.spec deleted file mode 100644 index 52eb3f3..0000000 --- a/pods.spec +++ /dev/null @@ -1,17 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'MediaPickerManager' - s.version = '0.0.1' - s.requires_arc = true - s.author = { - 'Morissard Jérome' => 'morissardj@gmail.com' - } - s.ios.deployment_target = '5.0' - s.summary = 'Easy-to-use UIImagePicker.' - s.license = { :type => 'MIT' } - s.homepage = 'https://github.com/leverdeterre/MediaPickerManager' - s.source = { - :git => 'https://github.com/leverdeterre/MediaPickerManager.git', - :tag => "0.0.1" - } - s.source_files = 'GenericPickerManager/MediaPickerManager/*.{h,m}' -end