improve nullability annotation for swift

Author: isaced

FEPopupMenuController/FEPopupMenuController.h

@@ -11,17 +11,17 @@
 
 @interface FEPopupMenuController : UIViewController
 
-@property (nonatomic, strong) NSArray<FEPopupMenuItem *> * __nullable items;
+@property (nonnull, nonatomic, strong) NSArray<FEPopupMenuItem *> *items;
 
 /**
  *  using FEPopupMenuItem init
  */
-- (instancetype __nonnull)initWithItems:(NSArray<FEPopupMenuItem * > * __nonnull)items;
+- (nonnull instancetype)initWithItems:(nonnull NSArray<FEPopupMenuItem * > *)items;
 
 /**
  *  popup the view controller
  */
-- (void)showInViewController:(UIViewController * __nonnull)viewController atPosition:(CGPoint)position;
+- (void)showInViewController:(nonnull UIViewController *)viewController atPosition:(CGPoint)position;
 
 /**
  *  dismiss the view controller
@@ -53,7 +53,7 @@
 /**
  *  the content view background color, default is white
  */
-@property (nonatomic, strong) UIColor * __nonnull contentViewBackgroundColor;
+@property (nullable, nonatomic, strong) UIColor *contentViewBackgroundColor;
 
 /**
  *  the content view corner radius, default is 8.0

FEPopupMenuController/FEPopupMenuItem.h

@@ -16,26 +16,26 @@ typedef void(^FEPopupMenuItemActionBlock)(void);
 /**
  *  init FEPopupMenuItem with title text and icon image
  */
-- (instancetype __nonnull)initWithTitle:(NSString * __nonnull)title iconImage:(UIImage * __nonnull)iconImage action:(FEPopupMenuItemActionBlock __nullable)action;
+- (nonnull instancetype)initWithTitle:(nullable NSString *)title iconImage:(nullable UIImage *)iconImage action:(nullable FEPopupMenuItemActionBlock)action;
 
 /**
  *  title of item
  */
-@property (nonatomic, copy) NSString * __nullable title;
+@property (nullable, nonatomic, copy) NSString *title;
 
 /**
  *  icon image of item
  */
-@property (nonatomic, strong) UIImage * __nullable iconImage;
+@property (nullable, nonatomic, strong) UIImage *iconImage;
 
 /**
  *  callback of item when selected
  */
-@property (nonatomic, copy) FEPopupMenuItemActionBlock __nullable action;
+@property (nullable, nonatomic, copy) FEPopupMenuItemActionBlock action;
 
 /**
  *  the color of title
  */
-@property (nonatomic, strong) UIColor * __nullable titleColor;
+@property (nullable, nonatomic, strong) UIColor *titleColor;
 
 @end