Merge branch 'release/1.1.0'

Author: Denis Bogatyrev

DBAttachmentPickerController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'DBAttachmentPickerController'
-  s.version      = '1.0.1'
+  s.version      = '1.1.0'
   s.authors = { 'Denis Bogatyrev' => '[email protected]' }
   s.summary      = 'This powerful component allows to select different types of files from different sources on your device'
   s.homepage     = 'https://github.com/d0ping/DBAttachmentPickerController'
@@ -10,5 +10,6 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/d0ping/DBAttachmentPickerController.git', :tag => "#{s.version}" }
   s.source_files = 'Source/**/*.{h,m}'
   s.resources = 'Source/**/*.{xib}'
+  s.resource_bundle = { 'DBAttachmentPickerController' => ['Source/Localization/*.lproj'] }
   s.public_header_files = 'Source/**/*.h'
 end

Example/DBAttachmentPickerControllerExample.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		A401D4F51D537AEC006B2909 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A401D4F71D537AEC006B2909 /* Localizable.strings */; };
+		A401D4FE1D5545F5006B2909 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = A401D5001D5545F5006B2909 /* Localizable.stringsdict */; };
 		C3134EB41C9C30990023B9E6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C3134EB31C9C30990023B9E6 /* main.m */; };
 		C3134EB71C9C30990023B9E6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C3134EB61C9C30990023B9E6 /* AppDelegate.m */; };
 		C3134EBD1C9C30990023B9E6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3134EBB1C9C30990023B9E6 /* Main.storyboard */; };
@@ -33,6 +35,25 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		A401D4F41D537A13006B2909 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
+		A401D4F81D537AEF006B2909 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A401D4F91D537AF0006B2909 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A401D4FF1D5545F5006B2909 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		A401D5011D5545F7006B2909 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ru; path = ru.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		A401D5021D554922006B2909 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		A401D5041D554AD3006B2909 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		A401D5051D554BD0006B2909 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		A401D5061D554BD0006B2909 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		A401D5071D554D71006B2909 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A401D5081D554D71006B2909 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = es; path = es.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		A401D5091D554FCD006B2909 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A401D50A1D554FCD006B2909 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		A401D50B1D555228006B2909 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A401D50C1D555228006B2909 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ja; path = ja.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		A401D50D1D5553CA006B2909 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A401D50E1D5553ED006B2909 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = uk; path = uk.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		A401D50F1D55560A006B2909 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A401D5101D55560A006B2909 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fr; path = fr.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		C3134EAF1C9C30990023B9E6 /* DBAttachmentPickerControllerExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DBAttachmentPickerControllerExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C3134EB31C9C30990023B9E6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		C3134EB51C9C30990023B9E6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -87,6 +108,16 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		A401D4F11D5378F2006B2909 /* Localization */ = {
+			isa = PBXGroup;
+			children = (
+				A401D4F71D537AEC006B2909 /* Localizable.strings */,
+				A401D5001D5545F5006B2909 /* Localizable.stringsdict */,
+			);
+			name = Localization;
+			path = ../../Source/Localization;
+			sourceTree = "<group>";
+		};
 		C3134EA61C9C30990023B9E6 = {
 			isa = PBXGroup;
 			children = (
@@ -138,6 +169,7 @@
 				C3134ED01C9C323C0023B9E6 /* Cells */,
 				C3849AB21C9C3D8C00D12EEF /* DBAttachmentAlertController */,
 				C3849AA91C9C3D8C00D12EEF /* DBAssetPickerController */,
+				A401D4F11D5378F2006B2909 /* Localization */,
 			);
 			name = DBAttachmentPickerController;
 			path = ../DBAttachmentPickerControllerExample;
@@ -281,6 +313,14 @@
 			knownRegions = (
 				en,
 				Base,
+				ru,
+				"zh-Hans",
+				"zh-Hant",
+				es,
+				de,
+				ja,
+				uk,
+				fr,
 			);
 			mainGroup = C3134EA61C9C30990023B9E6;
 			productRefGroup = C3134EB01C9C30990023B9E6 /* Products */;
@@ -301,7 +341,9 @@
 				C3134EC21C9C30990023B9E6 /* LaunchScreen.storyboard in Resources */,
 				C3849AB61C9C3D8C00D12EEF /* DBAssetGroupsViewController.xib in Resources */,
 				C3134EEB1C9C323C0023B9E6 /* DBAssetGroupCell.xib in Resources */,
+				A401D4FE1D5545F5006B2909 /* Localizable.stringsdict in Resources */,
 				C3134EED1C9C323C0023B9E6 /* DBThumbnailPhotoCell.xib in Resources */,
+				A401D4F51D537AEC006B2909 /* Localizable.strings in Resources */,
 				C3134EFC1C9C34340023B9E6 /* Assets.xcassets in Resources */,
 				C3134EBD1C9C30990023B9E6 /* Main.storyboard in Resources */,
 			);
@@ -335,6 +377,38 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
+		A401D4F71D537AEC006B2909 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A401D4F81D537AEF006B2909 /* en */,
+				A401D4F91D537AF0006B2909 /* ru */,
+				A401D5021D554922006B2909 /* zh-Hans */,
+				A401D5051D554BD0006B2909 /* zh-Hant */,
+				A401D5071D554D71006B2909 /* es */,
+				A401D5091D554FCD006B2909 /* de */,
+				A401D50B1D555228006B2909 /* ja */,
+				A401D50D1D5553CA006B2909 /* uk */,
+				A401D50F1D55560A006B2909 /* fr */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		A401D5001D5545F5006B2909 /* Localizable.stringsdict */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A401D4FF1D5545F5006B2909 /* en */,
+				A401D5011D5545F7006B2909 /* ru */,
+				A401D5041D554AD3006B2909 /* zh-Hans */,
+				A401D5061D554BD0006B2909 /* zh-Hant */,
+				A401D5081D554D71006B2909 /* es */,
+				A401D50A1D554FCD006B2909 /* de */,
+				A401D50C1D555228006B2909 /* ja */,
+				A401D50E1D5553ED006B2909 /* uk */,
+				A401D5101D55560A006B2909 /* fr */,
+			);
+			name = Localizable.stringsdict;
+			sourceTree = "<group>";
+		};
 		C3134EBB1C9C30990023B9E6 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -348,6 +422,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				C3134EC11C9C30990023B9E6 /* Base */,
+				A401D4F41D537A13006B2909 /* ru */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";

Example/DBAttachmentPickerControllerExample/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="cLE-FB-o3O">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="cLE-FB-o3O">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -20,7 +20,7 @@
                                 <rect key="frame" x="0.0" y="92" width="375" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZPV-BD-Xan" id="3FB-lf-K7T">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kEi-aA-7Ke">

Example/DBAttachmentPickerControllerExample/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/DBAttachmentPickerControllerExample/ru.lproj/LaunchScreen.strings

@@ -0,0 +1 @@
+

README.md

@@ -18,7 +18,7 @@ This powerful component allows to select different types of files from different
 
 To add DBAttachmentPickerController via [CocoaPods](http://cocoapods.org/) into your project:
 
-1. Add a pod entry for DBAttachmentPickerController to your Podfile `pod 'DBAttachmentPickerController', '~> 1.0.0'`
+1. Add a pod entry for DBAttachmentPickerController to your Podfile `pod 'DBAttachmentPickerController', '~> 1.1.0'`
 2. Install the pod by running `pod install`
 
 ### Source Files
@@ -91,12 +91,23 @@ To usage Document Picker you must:
 
 The class contain metadata about selected item. 
 
-You can use following properties to get metadata of file: `NSString *fileName`, `NSDate *creationDate`, `NSUInteger fileSize`, `NSString *fileSizeStr`. 
+You can use following properties to get metadata of file: 
+
+- `NSString *fileName` - The name of the file. Can be empty;
+- `NSDate *creationDate` - Creation date of the file. Can be nil;
+- `NSUInteger fileSize` - Size of the file in byte. Available only for existing files. ATTENTION: If you want get file size for PHAsset or something like that, you should calculate it after getting file data; 
+- `NSString *fileSizeStr` - Formatted string of file size. Can be empty. 
 
 To get thumbnail image you should call folowing method: `-loadThumbnailImageWithTargetSize:completion:`. Or you can get original image through method `-loadOriginalImageWithCompletion:`.
 
 Also you can get original file data if call appropriate method `-originalFileResource`.
 
+## Version history
+
+### 1.1.0
+- Added localization. Available following languages: English (Default), Russian, Spanish, German, French, Ukrainian, Chinese (Simplified and Traditional) and Japanese.
+- Added description for methods and properties on DBAttachment class. 
+
 ## Contact
 
 Denis Bogatyrev (maintainer)
@@ -112,4 +123,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Source/DBAssetPickerController/DBAssetGroupsViewController.m

@@ -40,7 +40,7 @@ @implementation DBAssetGroupsViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    self.navigationItem.title = @"Albums";
+    self.navigationItem.title = NSLocalizedString(@"Albums", nil);
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelButtonDidSelect:)];
 
     [self.tableView registerNib:[UINib nibWithNibName:NSStringFromClass([DBAssetGroupCell class]) bundle:nil] forCellReuseIdentifier:kAssetGroupsCellIdentifier];

Source/DBAssetPickerController/DBAssetGroupsViewController.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

Source/DBAssetPickerController/DBAssetItemsViewController.m

@@ -46,11 +46,11 @@ - (void)viewDidLoad {
 
     self.selectedIndexPathArray = [NSMutableArray arrayWithCapacity:100];
 
-    self.navigationItem.title = @"Camera roll";
+    self.navigationItem.title = self.assetCollection.localizedTitle;
 
     if ([self.assetItemsDelegate respondsToSelector:@selector(DBAssetImageViewControllerAllowsMultipleSelection:)]) {
         if ( [self.assetItemsDelegate DBAssetImageViewControllerAllowsMultipleSelection:self] ) {
-            self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Attach" style:UIBarButtonItemStyleDone target:self action:@selector(attachButtonDidSelect:)];
+            self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Attach", nil) style:UIBarButtonItemStyleDone target:self action:@selector(attachButtonDidSelect:)];
         }
     }
 

Source/DBAssetPickerController/DBAssetItemsViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DBAssetItemsViewController">