Merge pull request #1 from ZZBHuang/fromPLJNS

Trim a little for fitting code convention

YangMingShan/YMSPhotoPicker/Private/YMSAlbumCell.h

@@ -36,11 +36,5 @@
  *
  */
 @property (nonatomic, assign) NSUInteger photosCount;
-
-/**
- *  @brief Set the font used by the two labels displaying album name and the album count
- *
- */
-@property (nonatomic, assign) UIFont* fontForAlbumNameAndCount;
 
 @end

YangMingShan/YMSPhotoPicker/Private/YMSAlbumCell.m

@@ -7,6 +7,7 @@
 //
 
 #import "YMSAlbumCell.h"
+#import "YMSPhotoPickerTheme.h"
 
 @interface YMSAlbumCell()
 
@@ -18,6 +19,14 @@ @interface YMSAlbumCell()
 
 @implementation YMSAlbumCell
 
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+
+    self.photosCountLabel.font = [YMSPhotoPickerTheme sharedInstance].photosCountLabelFont;
+    self.albumNameLabel.font = [YMSPhotoPickerTheme sharedInstance].albumNameLabelFont;
+}
+
 - (NSString *)YMS_cellIdentifier
 {
     return @"YMSAlbumCell";
@@ -46,10 +55,4 @@ - (void)setPhotosCount:(NSUInteger)photosCount
     _photosCount = photosCount;    
 }
 
-- (void)setFontForAlbumNameAndCount:(UIFont *)fontForAlbumNameAndCount
-{
-    self.photosCountLabel.font = fontForAlbumNameAndCount;
-    self.albumNameLabel.font = fontForAlbumNameAndCount;
-}
-
 @end

YangMingShan/YMSPhotoPicker/Private/YMSAlbumPickerViewController.m

@@ -126,7 +126,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     PHCollection *collection = collectionItem[@"collection"];
 
     cell.albumName = collection.localizedTitle;
-    cell.fontForAlbumNameAndCount = [YMSPhotoPickerTheme sharedInstance].fontForAlbumNameAndCount ?: [UIFont systemFontOfSize:18.0];
     cell.photosCount = fetchResult.count;
     if ([collectionItem isEqual:self.selectedCollectionItem]) {
         cell.accessoryType = UITableViewCellAccessoryCheckmark;

YangMingShan/YMSPhotoPicker/Private/YMSPhotoCell.h

@@ -33,12 +33,6 @@
  */
 @property (nonatomic, assign) NSUInteger selectionOrder;
 
-/**
- *  @brief Set the font used for the number in the bottom right corner of the cell, specifying which order that photo was picked in
- *
- */
-@property (nonatomic, assign) UIFont *fontForSelectionOrder;
-
 /**
  * @brief Load the photo from photo library and display it on cell.
  *

YangMingShan/YMSPhotoPicker/Private/YMSPhotoCell.m

@@ -45,6 +45,7 @@ - (void)awakeFromNib
     [self addGestureRecognizer:self.longPressGestureRecognizer];
 
     self.selectionOrderLabel.textColor = [YMSPhotoPickerTheme sharedInstance].orderLabelTextColor;
+    self.selectionOrderLabel.font = [YMSPhotoPickerTheme sharedInstance].selectionOrderLabelFont;
 
     self.selectionVeil.layer.borderWidth = 4.0;
 
@@ -83,11 +84,6 @@ - (void)dealloc
     [self cancelImageRequest];
 }
 
-- (void)setFontForSelectionOrder:(UIFont *)fontForSelectionOrder
-{
-    self.selectionOrderLabel.font = fontForSelectionOrder;
-}
-
 #pragma mark - Publics
 
 - (void)loadPhotoWithManager:(PHImageManager *)manager forAsset:(PHAsset *)asset targetSize:(CGSize)size

YangMingShan/YMSPhotoPicker/Public/YMSPhotoPickerTheme.h

@@ -27,12 +27,6 @@
  */
 @property (nonatomic, strong) UIColor *titleLabelTextColor;
 
-/**
- * @brief Specify a UIFont that you want to apply on title label text and drop down arrow image in the middle of navigation bar to display current album localized name.
- *
- */
-@property (nonatomic, strong) UIFont *titleLabelFont;
-
 /**
  * @brief Describe a specific UIColor that you want to apply on whole picker view controllers' navigation bar.
  *
@@ -70,15 +64,27 @@
 @property (nonatomic, assign) UIStatusBarStyle statusBarStyle;
 
 /**
- * @brief Specify a UIFont that you want to apply to the table view showing album and album count information
+ * @brief Describe a specify UIFont that you want to apply on title label text and drop down arrow image in the middle of navigation bar to display current album localized name.
+ *
+ */
+@property (nonatomic, strong) UIFont *titleLabelFont;
+
+/**
+ * @brief Describe a specify UIFont that you want to apply to the table view showing album localized name.
+ *
+ */
+@property (nonatomic, strong) UIFont *albumNameLabelFont;
+
+/**
+ * @brief Describe a specify UIFont that you want to apply to the table view showing photo count insdie album.
  *
  */
-@property (nonatomic, assign) UIFont *fontForAlbumNameAndCount;
+@property (nonatomic, strong) UIFont *photosCountLabelFont;
 
 /**
- *  @brief Specify a UIFont that you want to apply to the number in the bottom right of photo cells after they're selected, denoting order of selection
+ * @brief Describe a specify UIFont that you want to apply to the number in the bottom right of photo cells after they're selected, denoting order of selection.
  */
-@property (nonatomic, assign) UIFont *fontForPhotoSelectionOrder;
+@property (nonatomic, strong) UIFont *selectionOrderLabelFont;
 
 /**
  * @brief Getting a shared instance of YMSPhotoPickerTheme.

YangMingShan/YMSPhotoPicker/Public/YMSPhotoPickerTheme.m

@@ -41,6 +41,10 @@ - (void)reset
     self.orderLabelTextColor = self.navigationBarBackgroundColor = self.cameraIconColor = [UIColor whiteColor];
     self.titleLabelTextColor = [UIColor blackColor];
     self.statusBarStyle = UIStatusBarStyleDefault;
+    self.titleLabelFont = [UIFont systemFontOfSize:18.0];
+    self.albumNameLabelFont = [UIFont systemFontOfSize:18.0 weight:UIFontWeightLight];
+    self.photosCountLabelFont = [UIFont systemFontOfSize:18.0 weight:UIFontWeightLight];
+    self.selectionOrderLabelFont = [UIFont systemFontOfSize:17.0];
 }
 
 @end

YangMingShan/YMSPhotoPicker/Public/YMSPhotoPickerViewController.m

@@ -203,7 +203,6 @@ - (BOOL)collectionView:(UICollectionView *)collectionView shouldSelectItemAtInde
         YMSPhotoCell *photoCell = (YMSPhotoCell *)cell;
         [photoCell setNeedsAnimateSelection];
         photoCell.selectionOrder = self.selectedPhotos.count+1;
-        photoCell.fontForSelectionOrder = self.theme.fontForPhotoSelectionOrder;
     }
     return YES;
 }