move addButtonsIfAvailable, restore headers

Author: eglitise

WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.h

@@ -95,6 +95,14 @@ typedef NS_ENUM(NSUInteger, FBUIInterfaceAppearance) {
  */
 - (BOOL)fb_openUrl:(NSString *)url withApplication:(NSString *)bundleId error:(NSError **)error;
 
+/**
+ Checks if the device has a specific hardware button available.
+
+ @param buttonName The name of the button to check (e.g., "home", "volumeUp", "volumeDown", "action", "camera")
+ @return YES if the button is available on the device, otherwise NO
+ */
+- (BOOL)fb_hasButton:(NSString *)buttonName;
+
 /**
  Presses the corresponding hardware button on the device with duration.
 

WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -244,16 +244,6 @@ - (BOOL)fb_hasButton:(NSString *)buttonName
   return NO;
 }
 
-- (void)fb_addButtonsIfAvailable:(NSArray<NSString *> *)buttonNames
-          toSupportedButtonNames:(NSMutableArray<NSString *> *)supportedButtonNames
-{
-  for (NSString *buttonName in buttonNames) {
-    if ([self fb_hasButton:buttonName]) {
-      [supportedButtonNames addObject:buttonName];
-    }
-  }
-}
-
 - (BOOL)fb_pressButton:(NSString *)buttonName
            forDuration:(nullable NSNumber *)duration
                  error:(NSError **)error
@@ -440,4 +430,14 @@ - (BOOL)fb_clearSimulatedLocation:(NSError **)error
 }
 #endif
 
+- (void)fb_addButtonsIfAvailable:(NSArray<NSString *> *)buttonNames
+          toSupportedButtonNames:(NSMutableArray<NSString *> *)supportedButtonNames
+{
+  for (NSString *buttonName in buttonNames) {
+    if ([self fb_hasButton:buttonName]) {
+      [supportedButtonNames addObject:buttonName];
+    }
+  }
+}
+
 @end