Moving back to UIColor

Author: Inbal-Tish

demo/src/screens/nativeComponentScreens/KeyboardTrackingViewScreen.js

@@ -62,7 +62,7 @@ export default class KeyboardTrackingViewScreen extends PureComponent {
     const {trackInteractive} = this.state;
 
     return (
-      <View flex bg-blue80 paddingT-page>
+      <View flex bg-grey80 paddingT-page>
         <ScrollView
           contentContainerStyle={styles.scrollContainer}
           keyboardDismissMode={trackInteractive ? 'interactive' : 'none'}
@@ -89,9 +89,9 @@ export default class KeyboardTrackingViewScreen extends PureComponent {
           trackInteractive={trackInteractive}
           useSafeArea
           addBottomView
-          bottomViewColor={Colors.grey80}
+          bottomViewColor={Colors.violet80}
         >
-          <View bg-grey80 row spread centerV paddingH-s5 paddingV-s3>
+          <View bg-violet80 row spread centerV paddingH-s5 paddingV-s3>
             <TextField
               migrate
               containerStyle={styles.textField}
@@ -121,7 +121,7 @@ const styles = StyleSheet.create({
   },
   textField: {
     flex: 1,
-    backgroundColor: Colors.grey50,
+    backgroundColor: Colors.grey80,
     paddingVertical: Spacings.s2,
     paddingHorizontal: Spacings.s4,
     borderRadius: 8

lib/components/Keyboard/KeyboardInput/KeyboardAccessoryView.tsx

@@ -102,8 +102,8 @@ export type KeyboardAccessoryViewProps = {
   addBottomView?: boolean;
   /**
    * iOS only.
-   * The bottom view's color as an hex string
-   * default: '#ffffff'
+   * The bottom view's color
+   * default: 'white'
    */
   bottomViewColor?: string;
   /**

lib/components/Keyboard/KeyboardInput/keyboardAccessoryView.api.json

@@ -88,9 +88,9 @@
     {
       "name": "bottomViewColor", 
       "type": "string", 
-      "description": "The bottom view's color as an hex string\niOS only.",       
+      "description": "The bottom view's color\niOS only.",       
       "note": "KeyboardTrackingView prop. iOS only",
-      "default": "#ffffff"
+      "default": "white"
     },
     {
       "name": "useSafeArea",

lib/components/Keyboard/KeyboardTracking/KeyboardTrackingView/index.tsx

@@ -55,8 +55,8 @@ export type KeyboardTrackingViewProps = ViewProps & {
   addBottomView?: boolean;
   /**
    * iOS only.
-   * The bottom view's color as an hex string
-   * default: '#ffffff'
+   * The bottom view's color
+   * default: 'white'
    */
   bottomViewColor?: string;
   /**

lib/components/Keyboard/KeyboardTracking/KeyboardTrackingView/keyboardTrackingView.api.json

@@ -53,9 +53,9 @@
     {
       "name": "bottomViewColor", 
       "type": "string", 
-      "description": "The bottom view's color as an hex string\niOS only.",       
+      "description": "The bottom view's color\niOS only.",       
       "note": "iOS only",
-      "default": "#ffffff"
+      "default": "white"
     },
     {
       "name": "useSafeArea",

lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m

@@ -50,7 +50,7 @@ @interface KeyboardTrackingViewTemp : UIView
 @property (nonatomic) CGFloat originalHeight;
 @property (nonatomic) KeyboardTrackingScrollBehavior scrollBehavior;
 @property (nonatomic) BOOL addBottomView;
-@property (nonatomic, strong) NSString *bottomViewColor;
+@property (nonatomic, strong) UIColor *bottomViewColor;
 @property (nonatomic) BOOL useSafeArea;
 @property (nonatomic) BOOL usesBottomTabs;
 @property (nonatomic) BOOL scrollToFocusedInput;
@@ -83,7 +83,7 @@ -(instancetype)init
         _bottomViewHeight = kBottomViewHeightTemp;
 
         self.addBottomView = NO;
-        self.bottomViewColor = @"#ffffff";
+        self.bottomViewColor = [UIColor whiteColor];
         self.scrollToFocusedInput = NO;
         self.usesBottomTabs = NO;
 
@@ -442,44 +442,19 @@ - (void)_updateScrollViewInsets
 
 #pragma mark - bottom view
 
-- (unsigned int)intFromHexString:(NSString *)hexStr
-{
-  unsigned int hexInt = 0;
-  // Create scanner
-  NSScanner *scanner = [NSScanner scannerWithString:hexStr];
-  // Tell scanner to skip the # character
-  [scanner setCharactersToBeSkipped:[NSCharacterSet characterSetWithCharactersInString:@"#"]];
-  // Scan hex value
-  [scanner scanHexInt:&hexInt];
-  return hexInt;
-}
-
-- (UIColor *)getUIColorObjectFromHexString:(NSString *)hexStr alpha:(CGFloat)alpha
-{
-  // Convert hex string to an integer
-  unsigned int hexint = [self intFromHexString:hexStr];
-  // Create a color object, specifying alpha as well
-  UIColor *color =
-    [UIColor colorWithRed:((CGFloat) ((hexint & 0xFF0000) >> 16))/255
-    green:((CGFloat) ((hexint & 0xFF00) >> 8))/255
-    blue:((CGFloat) (hexint & 0xFF))/255
-    alpha:alpha];
-  return color;
-}
-
 -(void)setAddBottomView:(BOOL)addBottomView
 {
     _addBottomView = addBottomView;
 
     [self addBottomViewIfNecessary];
 }
 
--(void)setBottomViewColor:(NSString *)bottomViewColor
+-(void)setBottomViewColor:(UIColor *)bottomViewColor
 {
     _bottomViewColor = bottomViewColor;
-    
+
     if (self.addBottomView && _bottomView != nil) {
-        _bottomView.backgroundColor = [self getUIColorObjectFromHexString:_bottomViewColor alpha:1];
+        _bottomView.backgroundColor = _bottomViewColor;
     }
 }
 
@@ -488,8 +463,8 @@ -(void)addBottomViewIfNecessary
     if (self.addBottomView && _bottomView == nil)
     {
         _bottomView = [UIView new];
-        _bottomView.backgroundColor = [self getUIColorObjectFromHexString:self.bottomViewColor alpha:1];
-
+        _bottomView.backgroundColor = self.bottomViewColor;
+        
         [self addSubview:_bottomView];
         [self updateBottomViewFrame];
     }
@@ -691,7 +666,7 @@ @implementation KeyboardTrackingViewTempManager
 RCT_REMAP_VIEW_PROPERTY(manageScrollView, manageScrollView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(requiresSameParentToManageScrollView, requiresSameParentToManageScrollView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(addBottomView, addBottomView, BOOL)
-RCT_REMAP_VIEW_PROPERTY(bottomViewColor, bottomViewColor, NSString)
+RCT_REMAP_VIEW_PROPERTY(bottomViewColor, bottomViewColor, UIColor)
 RCT_REMAP_VIEW_PROPERTY(useSafeArea, useSafeArea, BOOL)
 RCT_REMAP_VIEW_PROPERTY(usesBottomTabs, usesBottomTabs, BOOL)
 RCT_REMAP_VIEW_PROPERTY(scrollToFocusedInput, scrollToFocusedInput, BOOL)