Implement SDL 0179 - Pixel density and Scale

SmartDeviceLink/SDLFocusableItemLocator.m

@@ -6,6 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <simd/simd.h>
 
 #import "SDLFocusableItemLocator.h"
 #import "SDLLogMacros.h"
@@ -28,17 +29,21 @@ @interface SDLFocusableItemLocator()
  reference to SDLConnectionManager
  */
 @property (nonatomic, weak) id<SDLConnectionManagerType> connectionManager;
+
+@property (nonatomic, assign) float scale;
+
 @end
 
 
 @implementation SDLFocusableItemLocator
 
-- (instancetype)initWithViewController:(UIViewController *)viewController connectionManager:(id<SDLConnectionManagerType>)connectionManager {
+- (instancetype)initWithViewController:(UIViewController *)viewController connectionManager:(id<SDLConnectionManagerType>)connectionManager scale:(float)scale {
     self = [super init];
     if(!self) {
         return nil;
     }
 
+    _scale = simd_clamp(scale, 1.f, 10.f);
     _viewController = viewController;
     _connectionManager = connectionManager;
     _enableHapticDataRequests = NO;
@@ -127,14 +132,15 @@ - (nullable UIView *)viewForPoint:(CGPoint)point {
     for (UIView *view in self.focusableViews) {
         //Convert the absolute location to local location and check if that falls within view boundary
         CGPoint localPoint = [view convertPoint:point fromView:self.viewController.view];
+        localPoint.x /= self.scale;
+        localPoint.y /= self.scale;
         if ([view pointInside:localPoint withEvent:nil]) {
             if (selectedView != nil) {
-                selectedView = nil;
-                break;
+                return nil;
                 //the point has been indentified in two views. We cannot identify which with confidence.
-            } else {
-                selectedView = view;
             }
+
+            selectedView = view;
         }
     }
 

SmartDeviceLink/SDLFocusableItemLocatorType.h

@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param viewController UIViewController to be checked for focusable views
  @param connectionManager Object of a class that implements ConnectionManagerType. This is used for RPC communication.
  */
-- (instancetype)initWithViewController:(UIViewController *)viewController connectionManager:(id<SDLConnectionManagerType>)connectionManager;
+- (instancetype)initWithViewController:(UIViewController *)viewController connectionManager:(id<SDLConnectionManagerType>)connectionManager scale:(float)scale;
 
 /**
  updateInterfaceLayout crawls through the view hierarchy, updates and keep tracks of views to be reported through Haptic RPC. This function is automatically called when SDLDidUpdateProjectionView notification is sent by the application.

SmartDeviceLink/SDLStreamingVideoLifecycleManager.m

@@ -110,7 +110,10 @@ - (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connecti
         NSAssert(configuration.streamingMediaConfig.enableForcedFramerateSync, @"When using CarWindow (rootViewController != nil), forceFrameRateSync must be YES");
         if (@available(iOS 9.0, *)) {
             SDLLogD(@"Initializing focusable item locator");
-            _focusableItemManager = [[SDLFocusableItemLocator alloc] initWithViewController:configuration.streamingMediaConfig.rootViewController connectionManager:_connectionManager];
+            _focusableItemManager = [[SDLFocusableItemLocator alloc]
+                                     initWithViewController:configuration.streamingMediaConfig.rootViewController
+                                     connectionManager:_connectionManager
+                                     scale:self.sdl_scale];
         }
 
         SDLLogD(@"Initializing CarWindow");
@@ -411,7 +414,7 @@ - (void)didEnterStateVideoStreamReady {
 
         SDLLogD(@"Attempting to create video encoder");
         const float scale = self.sdl_scale;
-        CGSize scaledScreenSize = CGSizeMake(self.screenSize.width / scale, self.screenSize.height / scale);
+        const CGSize scaledScreenSize = CGSizeMake(self.screenSize.width / scale, self.screenSize.height / scale);
         self.videoEncoder = [[SDLH264VideoEncoder alloc] initWithProtocol:self.videoFormat.protocol dimensions:scaledScreenSize ssrc:self.ssrc properties:self.videoEncoderSettings delegate:self error:&error];
 
         if (error || self.videoEncoder == nil) {

SmartDeviceLinkTests/ProxySpecs/SDLHapticManagerSpec.m

@@ -64,7 +64,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField1 = [[UITextField alloc] initWithFrame:viewRect1];
             [uiViewController.view addSubview:textField1];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = NO;
             [hapticManager updateInterfaceLayout];
         });
@@ -78,7 +78,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
 
     context(@"when initialized with no focusable view", ^{
         beforeEach(^{
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             [hapticManager updateInterfaceLayout];
         });
 
@@ -94,7 +94,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField1 = [[UITextField alloc]  initWithFrame:viewRect1];
             [uiViewController.view addSubview:textField1];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
         });
@@ -121,7 +121,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UIButton *button = [[UIButton alloc] initWithFrame:viewRect1];
             [uiViewController.view addSubview:button];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
         });
@@ -144,7 +144,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
 
     context(@"when initialized with no views and then updated with two additional views", ^{
         beforeEach(^{
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
 
@@ -192,7 +192,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField2 = [[UITextField alloc]  initWithFrame:viewRect2];
             [textField addSubview:textField2];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
         });
@@ -230,7 +230,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField2 = [[UITextField alloc]  initWithFrame:viewRect2];
             [button addSubview:textField2];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
         });
@@ -265,7 +265,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField2 = [[UITextField alloc]  initWithFrame:viewRect2];
             [uiViewController.view addSubview:textField2];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
 
@@ -296,7 +296,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField1 = [[UITextField alloc]  initWithFrame:viewRect1];
             [uiViewController.view addSubview:textField1];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
 
@@ -335,7 +335,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField2 = [[UITextField alloc]  initWithFrame:CGRectMake(201, 201, 50, 50)];
             [uiViewController.view addSubview:textField2];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
         });
@@ -357,7 +357,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField2 = [[UITextField alloc]  initWithFrame:CGRectMake(126, 126, 50, 50)];
             [uiViewController.view addSubview:textField2];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
         });
@@ -373,7 +373,7 @@ BOOL compareRectangle(SDLRectangle *sdlRectangle, CGRect cgRect) {
             UITextField *textField1 = [[UITextField alloc]  initWithFrame:CGRectMake(101, 101, 50, 50)];
             [uiWindow insertSubview:textField1 aboveSubview:uiWindow];
 
-            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager];
+            hapticManager = [[SDLFocusableItemLocator alloc] initWithViewController:uiViewController  connectionManager:sdlLifecycleManager scale:1.f];
             hapticManager.enableHapticDataRequests = YES;
             [hapticManager updateInterfaceLayout];
         });