fix(ios): deprecate selectedBackgroundColor and selectedBackgroundImage

tidev · Mar 10, 2021 · dc07aeb · dc07aeb
1 parent 260f65b
commit dc07aeb
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 7 deletions.
diff --git a/iphone/Classes/TiUIListItem.m b/iphone/Classes/TiUIListItem.m
@@ -541,15 +541,36 @@ - (void)setDataItem:(NSDictionary *)dataItem
   }
   [self setSelectedBackgroundGradient_:selectedBackgroundGradientValue];
 
-  id selectedbackgroundColorValue = [properties objectForKey:@"selectedBackgroundColor"];
+  id selectedbackgroundColorValue = [properties objectForKey:@"backgroundSelectedColor"];
   if (IS_NULL_OR_NIL(selectedbackgroundColorValue)) {
-    selectedbackgroundColorValue = [_proxy valueForKey:@"selectedBackgroundColor"];
+    selectedbackgroundColorValue = [_proxy valueForKey:@"backgroundSelectedColor"];
+  }
+  if (IS_NULL_OR_NIL(selectedbackgroundColorValue)) {
+    selectedbackgroundColorValue = [properties valueForKey:@"selectedBackgroundColor"];
+
+    if (IS_NULL_OR_NIL(selectedbackgroundColorValue)) {
+      selectedbackgroundColorValue = [_proxy valueForKey:@"selectedBackgroundColor"];
+    }
+    if (!IS_NULL_OR_NIL(selectedbackgroundColorValue)) {
+      DEPRECATED_REPLACED(@"selectedBackgroundColor", @"10.0.0", @"backgroundSelectedColor");
+    }
   }
 
-  id selectedBackgroundImageValue = [properties objectForKey:@"selectedBackgroundImage"];
+  id selectedBackgroundImageValue = [properties objectForKey:@"backgroundSelectedImage"];
   if (IS_NULL_OR_NIL(selectedBackgroundImageValue)) {
-    selectedBackgroundImageValue = [_proxy valueForKey:@"selectedBackgroundImage"];
+    selectedBackgroundImageValue = [_proxy valueForKey:@"backgroundSelectedImage"];
   }
+  if (IS_NULL_OR_NIL(selectedBackgroundImageValue)) {
+    selectedBackgroundImageValue = [properties valueForKey:@"selectedBackgroundImage"];
+
+    if (IS_NULL_OR_NIL(selectedbackgroundColorValue)) {
+      selectedbackgroundColorValue = [_proxy valueForKey:@"selectedBackgroundImage"];
+    }
+    if (!IS_NULL_OR_NIL(selectedBackgroundImageValue)) {
+      DEPRECATED_REPLACED(@"selectedBackgroundImage", @"10.0.0", @"backgroundSelectedImage");
+    }
+  }
+
   [self applyBackgroundWithSelectedColor:selectedbackgroundColorValue selectedImage:selectedBackgroundImageValue];
   [_resetKeys enumerateObjectsUsingBlock:^(NSString *keyPath, BOOL *stop) {
     id value = [_initialValues objectForKey:keyPath];

diff --git a/iphone/Classes/TiUITableViewRowProxy.m b/iphone/Classes/TiUITableViewRowProxy.m
@@ -393,7 +393,14 @@ - (void)configureBackground:(UITableViewCell *)cell
   [(TiUITableViewCell *)cell setSelectedBackgroundGradient_:[self valueForKey:@"selectedBackgroundGradient"]];
 
   id bgImage = [self valueForKey:@"backgroundImage"];
-  id selBgColor = [self valueForKey:@"selectedBackgroundColor"];
+  id selBgColor = [self valueForKey:@"backgroundSelectedColor"];
+  if (IS_NULL_OR_NIL(selBgColor)) {
+    selBgColor = [self valueForKey:@"selectedBackgroundColor"];
+
+    if (!IS_NULL_OR_NIL(selBgColor)) {
+      DEPRECATED_REPLACED(@"selectedBackgroundColor", @"10.0.0", @"backgroundSelectedColor");
+    }
+  }
 
   if (bgImage != nil) {
     NSURL *url = [TiUtils toURL:bgImage proxy:(TiProxy *)table.proxy];
@@ -409,7 +416,14 @@ - (void)configureBackground:(UITableViewCell *)cell
     cell.backgroundView = nil;
   }
 
-  id selBgImage = [self valueForKey:@"selectedBackgroundImage"];
+  id selBgImage = [self valueForKey:@"backgroundSelectedImage"];
+  if (IS_NULL_OR_NIL(selBgImage)) {
+    selBgImage = [self valueForKey:@"selectedBackgroundImage"];
+
+    if (!IS_NULL_OR_NIL(selBgImage)) {
+      DEPRECATED_REPLACED(@"selectedBackgroundImage", @"10.0.0", @"backgroundSelectedImage");
+    }
+  }
   if (selBgImage != nil) {
     NSURL *url = [TiUtils toURL:selBgImage proxy:(TiProxy *)table.proxy];
     UIImage *image = [[ImageLoader sharedLoader] loadImmediateStretchableImage:url withLeftCap:leftCap topCap:topCap];
@@ -851,15 +865,29 @@ - (void)fireEvent:(NSString *)type withObject:(id)obj propagate:(BOOL)propagate
 
 - (BOOL)shouldUseBackgroundView
 {
-  return [self valueForKey:@"selectedBackgroundColor"]
+  return [self valueForKey:@"backgroundSelectedColor"]
+      || [self valueForKey:@"selectedBackgroundColor"]
       || [self valueForKey:@"backgroundImage"]
+      || [self valueForKey:@"backgroundSelectedImage"]
       || [self valueForKey:@"selectedBackgroundImage"]
       || [self valueForKey:@"backgroundLeftCap"]
       || [self valueForKey:@"backgroundTopCap"];
 }
 
+- (void)setBackgroundSelectedColor:(id)arg
+{
+  [self replaceValue:arg forKey:@"backgroundSelectedColor" notification:NO];
+  TiThreadPerformOnMainThread(
+      ^{
+        if ([self viewAttached]) {
+          [self configureBackground:callbackCell];
+        }
+      },
+      NO);
+}
 - (void)setSelectedBackgroundColor:(id)arg
 {
+  DEPRECATED_REPLACED(@"selectedBackgroundColor", @"10.0.0", @"backgroundSelectedColor");
   [self replaceValue:arg forKey:@"selectedBackgroundColor" notification:NO];
   TiThreadPerformOnMainThread(
       ^{
@@ -882,8 +910,20 @@ - (void)setBackgroundImage:(id)arg
       NO);
 }
 
+- (void)setBackgroundSelectedImage:(id)arg
+{
+  [self replaceValue:arg forKey:@"backgroundSelectedImage" notification:NO];
+  TiThreadPerformOnMainThread(
+      ^{
+        if ([self viewAttached]) {
+          [self configureBackground:callbackCell];
+        }
+      },
+      NO);
+}
 - (void)setSelectedBackgroundImage:(id)arg
 {
+  DEPRECATED_REPLACED(@"selectedBackgroundImage", @"10.0.0", @"backgroundSelectedImage");
   [self replaceValue:arg forKey:@"selectedBackgroundImage" notification:NO];
   TiThreadPerformOnMainThread(
       ^{