[EZ] Add some typing to example project, cleanup some code.

Author: d16r

Examples/LICENSE-Examples.md

@@ -0,0 +1,9 @@
+This file provided by Facebook is for non-commercial testing and evaluation
+purposes only.  Facebook reserves all rights not expressly granted.
+
+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
+FACEBOOK 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.

Examples/README.md

@@ -13,7 +13,8 @@
 
 #import "WildeGuessCollectionViewController.h"
 
-@implementation AppDelegate {
+@implementation AppDelegate
+{
   UIWindow *_window;
 }
 

Examples/WildeGuess/WildeGuess/AppDelegate.mm

@@ -54,24 +54,19 @@ + (instancetype)newWithQuote:(Quote *)quote
       {[CKOverlayLayoutComponent
         newWithComponent:[QuoteComponent newWithQuote:quote context:context]
         overlay:overlay]},
-      {hairlineComponent()}
+      {[CKComponent
+        newWithView:{
+          [UIView class],
+          {{@selector(setBackgroundColor:), [UIColor lightGrayColor]}}
+        }
+        size:{.height = 1/[UIScreen mainScreen].scale}]}
     }]];
   if (c) {
     c->_overlay = overlay;
   }
   return c;
 }
 
-static CKComponent *hairlineComponent()
-{
-  return [CKComponent
-          newWithView:{
-            [UIView class],
-            {{@selector(setBackgroundColor:), [UIColor lightGrayColor]}}
-          }
-          size:{.height = 1/[UIScreen mainScreen].scale}];
-}
-
 + (id)initialState
 {
   return @NO;

Examples/WildeGuess/WildeGuess/Components/InteractiveQuoteComponent.mm

@@ -14,7 +14,7 @@
 
 @interface QuoteContext : NSObject
 
-- (instancetype)initWithImageNames:(NSSet *)imageNames;
+- (instancetype)initWithImageNames:(NSSet<NSString *> *)imageNames;
 
 - (UIImage *)imageNamed:(NSString *)imageName;
 

Examples/WildeGuess/WildeGuess/QuoteContext.h

@@ -13,13 +13,13 @@
 
 @implementation QuoteContext
 {
-  NSDictionary *_images;
+  NSDictionary<NSString *, UIImage *> *_images;
 }
 
-- (instancetype)initWithImageNames:(NSSet *)imageNames
+- (instancetype)initWithImageNames:(NSSet<NSString *> *)imageNames
 {
   if (self = [super init]) {
-       _images = loadImages(imageNames);
+    _images = loadImages(imageNames);
   }
   return self;
 }
@@ -29,9 +29,9 @@ - (UIImage *)imageNamed:(NSString *)imageName
   return _images[imageName];
 }
 
-static NSDictionary *loadImages(NSSet *imageNames)
+static NSDictionary<NSString *, UIImage *> *loadImages(NSSet *imageNames)
 {
-  NSMutableDictionary *imageDictionary = [[NSMutableDictionary alloc] init];
+  NSMutableDictionary<NSString *, UIImage *> *imageDictionary = [NSMutableDictionary new];
   for (NSString *imageName in imageNames) {
     UIImage *image = [UIImage imageNamed:imageName];
     if (image) {

Examples/WildeGuess/WildeGuess/QuoteContext.m

@@ -11,7 +11,6 @@
 
 #import <Foundation/Foundation.h>
 
-@class CKCollectionViewDataSource;
 @class QuotesPage;
 
 /**

Examples/WildeGuess/WildeGuess/QuoteModelController.h

@@ -42,22 +42,22 @@ - (QuotesPage *)fetchNewQuotesPageWithCount:(NSInteger)count
 
 #pragma mark - Random Quote Generation
 
-static NSArray *generateRandomQuotes(NSInteger count)
+static NSArray<Quote *> *generateRandomQuotes(NSInteger count)
 {
-  NSMutableArray *_quotes = [NSMutableArray new];
+  NSMutableArray<Quote *> *quotes = [[NSMutableArray alloc] initWithCapacity:count];
   for (NSUInteger i = 0; i< count; i++) {
-    NSDictionary *randomQuote = generateRandomQuoteInfo();
-    Quote *quote  = [[Quote alloc] initWithText:randomQuote[@"text"]
-                                         author:randomQuote[@"author"]
+    NSDictionary<NSString *, NSString *> *quoteInfo = generateRandomQuoteInfo();
+    Quote *quote  = [[Quote alloc] initWithText:quoteInfo[@"text"]
+                                         author:quoteInfo[@"author"]
                                           style:generateStyle(i)];
-    [_quotes addObject:quote];
+    [quotes addObject:quote];
   }
-  return _quotes;
+  return quotes;
 }
 
-static NSDictionary *generateRandomQuoteInfo()
+static NSDictionary<NSString *, NSString *> *generateRandomQuoteInfo()
 {
-  NSArray *quotes = quotesList();
+  NSArray<NSDictionary<NSString *, NSString *> *> *quotes = quotesList();
   return quotes[arc4random_uniform((uint32_t)[quotes count])];
 }
 
@@ -76,7 +76,7 @@ static QuoteDisplayStyle generateStyle(NSUInteger index)
   }
 }
 
-static NSArray *quotesList()
+static NSArray<NSDictionary<NSString *, NSString *> *> *quotesList()
 {
   static NSArray *quotes;
   static dispatch_once_t once;

Examples/WildeGuess/WildeGuess/QuoteModelController.m

@@ -11,13 +11,14 @@
 
 #import <Foundation/Foundation.h>
 
+@class Quote;
 
 @interface QuotesPage : NSObject
 
-@property (nonatomic, readonly, strong) NSArray *quotes;
+@property (nonatomic, readonly, copy) NSArray<Quote *> *quotes;
 @property (nonatomic, readonly, assign) NSInteger position;
 
-- (instancetype)initWithQuotes:(NSArray *)quotes
+- (instancetype)initWithQuotes:(NSArray<Quote *> *)quotes
                       position:(NSInteger)position;
 
 @end

Examples/WildeGuess/WildeGuess/QuotesPage.h

@@ -13,11 +13,11 @@
 
 @implementation QuotesPage
 
-- (instancetype)initWithQuotes:(NSArray *)quotes
+- (instancetype)initWithQuotes:(NSArray<Quote *> *)quotes
                       position:(NSInteger)position
 {
   if (self = [super init]) {
-    _quotes = quotes;
+    _quotes = [quotes copy];
     _position = position;
   }
   return self;

Examples/WildeGuess/WildeGuess/QuotesPage.m

@@ -33,7 +33,7 @@ - (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
 {
   if (self = [super initWithCollectionViewLayout:layout]) {
     _sizeRangeProvider = [CKComponentFlexibleSizeRangeProvider providerWithFlexibility:CKComponentSizeRangeFlexibleHeight];
-    _quoteModelController = [[QuoteModelController alloc] init];
+    _quoteModelController = [QuoteModelController new];
     self.title = @"Wilde Guess";
     self.navigationItem.prompt = @"Tap to reveal which quotes are from Oscar Wilde";
   }
@@ -46,12 +46,12 @@ - (void)viewDidLoad
   // Preload images for the component context that need to be used in component preparation. Components preparation
   // happens on background threads but +[UIImage imageNamed:] is not thread safe and needs to be called on the main
   // thread. The preloaded images are then cached on the component context for use inside components.
-  NSSet *imageNames = [NSSet setWithObjects:
-                       @"LosAngeles",
-                       @"MarketStreet",
-                       @"Drops",
-                       @"Powell",
-                       nil];
+  NSSet<NSString *> *imageNames = [NSSet setWithObjects:
+                                   @"LosAngeles",
+                                   @"MarketStreet",
+                                   @"Drops",
+                                   @"Powell",
+                                   nil];
   self.collectionView.backgroundColor = [UIColor whiteColor];
   self.collectionView.delegate = self;
   QuoteContext *context = [[QuoteContext alloc] initWithImageNames:imageNames];