fix review

Author: KazuCocoa

WebDriverAgentLib copy-Info.plist

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
   /**
    Return current focused element
    */
-- (id<FBElement>) fb_focusedElement;
+- (id<FBElement>)fb_focusedElement;
 
   @end
 

WebDriverAgentLib/Categories/XCUIApplication+FBFocused.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface XCUIElement (FBTVFocuse)
 
 /**
- Sets focuse
+ Sets focus
 
  @param error If there is an error, upon return contains an NSError object that describes the problem.
  @return YES if the operation succeeds, otherwise NO.

WebDriverAgentLib/Categories/XCUIElement+FBTVFocuse.h

@@ -46,7 +46,7 @@ - (BOOL)fb_setFocusWithError:(NSError**) error
       return NO;
     }
 
-    FBTVDirection direction = tracker.directionToMoveFocuse;
+    FBTVDirection direction = tracker.directionToFocusedElement;
     if (direction != FBTVDirectionNone) {
       [[XCUIRemote sharedRemote] pressButton: (XCUIRemoteButton)direction];
     }

WebDriverAgentLib/Categories/XCUIElement+FBTVFocuse.m

@@ -51,8 +51,7 @@ - (BOOL)fb_typeText:(NSString *)text frequency:(NSUInteger)frequency error:(NSEr
   // There is no ability to open text field via tap
 #if TARGET_OS_TV
   if (!self.hasKeyboardFocus) {
-    [[[FBErrorBuilder builder] withDescription:@"Keyboard is not opened."] buildError:error];
-    return NO;
+    return [[[FBErrorBuilder builder] withDescription:@"Keyboard is not opened."] buildError:error];
   }
 #else
   if (![self fb_prepareForTextInputWithError:error]) {

WebDriverAgentLib/Categories/XCUIElement+FBTyping.m

@@ -23,6 +23,7 @@ extern NSString *const SPRINGBOARD_BUNDLE_ID;
 
 /**
  Opens application on SpringBoard(HeadBoard) app with given identifier
+
  @param identifier identifier of the application to tap
  @param error If there is an error, upon return contains an NSError object that describes the problem.
  @return YES if the operation succeeds, otherwise NO.

WebDriverAgentLib/FBSpringboardApplication.h

@@ -28,19 +28,22 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FBTVNavigationTracker : NSObject
 
-  /**
-   Track the target element's point
-   @param targetElement A target element which will track
-   @return An instancce of FBTVNavigationTracker
-   */
-  +(instancetype)trackerWithTargetElement: (id<FBElement>) targetElement;
-
-  /**
-   Move focuse to the tracked target element from current focuse
-   */
-  -(FBTVDirection)directionToMoveFocuse;
-
-  @end
+/**
+ Track the target element's point
+
+ @param targetElement A target element which will track
+ @return An instancce of FBTVNavigationTracker
+ */
++ (instancetype)trackerWithTargetElement: (id<FBElement>) targetElement;
+
+/**
+ Move the focus to the tracked target element from the currently focused one
+
+ @return FBTVDirection to move the focus to
+ */
+- (FBTVDirection)directionToFocusedElement;
+
+@end
 
 NS_ASSUME_NONNULL_END
 

WebDriverAgentLib/Utilities/FBTVNavigationTracker.h

@@ -19,7 +19,7 @@
 
 @interface FBTVNavigationItem : NSObject
 @property (nonatomic, readonly) NSUInteger uid;
-@property (nonatomic, strong) NSMutableSet<NSNumber *>* directions;
+@property (nonatomic, readonly) NSMutableSet<NSNumber *>* directions;
 
 + (instancetype)itemWithUid:(NSUInteger) uid;
 @end
@@ -69,11 +69,11 @@ - (instancetype)initWithTargetElement:(id<FBElement>)targetElement
   return self;
 }
 
-- (FBTVDirection)directionToMoveFocuse
+- (FBTVDirection)directionToFocusedElement
 {
   id<FBElement> focused = self.focusedElement;
   CGPoint focusedCenter = FBRectGetCenter(focused.wdFrame);
-  FBTVNavigationItem *item = [self navigationItemFromElement:focused];
+  FBTVNavigationItem *item = [self navigationItemWithElement:focused];
   CGFloat yDelta = self.targetCenter.y - focusedCenter.y;
   CGFloat xDelta = self.targetCenter.x - focusedCenter.x;
   FBTVDirection direction;
@@ -98,7 +98,7 @@ - (FBTVDirection)directionToMoveFocuse
   return [FBApplication fb_activeApplication].fb_focusedElement;
 }
 
-- (FBTVNavigationItem*) navigationItemFromElement:(id<FBElement>)element
+- (FBTVNavigationItem*)navigationItemWithElement:(id<FBElement>)element
 {
   NSNumber *key = [NSNumber numberWithUnsignedInteger:element.wdUID];
   FBTVNavigationItem* item = [self.navigationItems objectForKey: key];
@@ -112,34 +112,32 @@ - (FBTVNavigationItem*) navigationItemFromElement:(id<FBElement>)element
 
 - (FBTVDirection)getHorizontalDirectionForItem:(FBTVNavigationItem *)item withDelta:(CGFloat)delta
 {
-  if (delta > 0) {
-    if(![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionRight]]) {
-      [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionRight]];
-      return FBTVDirectionRight;
-    }
+  // GCFloat is double in 64bit. tvOS is only for arm64
+  if (delta > DBL_EPSILON &&
+      ![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionRight]]) {
+    [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionRight]];
+    return FBTVDirectionRight;
   }
-  if (delta < 0) {
-    if(![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionLeft]]) {
-      [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionLeft]];
-      return FBTVDirectionLeft;
-    }
+  if (delta < DBL_EPSILON &&
+      ![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionLeft]]) {
+    [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionLeft]];
+    return FBTVDirectionLeft;
   }
   return FBTVDirectionNone;
 }
 
 - (FBTVDirection)getVerticalDirectionForItem:(FBTVNavigationItem *)item withDelta:(CGFloat)delta
 {
-  if (delta > 0) {
-    if(![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionDown]]) {
-      [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionDown]];
-      return FBTVDirectionDown;
-    }
+  // GCFloat is double in 64bit. tvOS is only for arm64
+  if (delta > DBL_EPSILON &&
+      ![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionDown]]) {
+    [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionDown]];
+    return FBTVDirectionDown;
   }
-  if (delta < 0) {
-    if(![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionUp]]) {
-      [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionUp]];
-      return FBTVDirectionUp;
-    }
+  if (delta < DBL_EPSILON &&
+      ![item.directions containsObject: [NSNumber numberWithInteger: FBTVDirectionUp]]) {
+    [item.directions addObject: [NSNumber numberWithInteger: FBTVDirectionUp]];
+    return FBTVDirectionUp;
   }
   return FBTVDirectionNone;
 }