Use imageWithConfiguration: on iOS 13+

microsoft · Jul 20, 2020 · 67ce9fb · 67ce9fb
1 parent 9a0cce8
commit 67ce9fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Sources/DarkModeCore/DMDynamicImage.m b/Sources/DarkModeCore/DMDynamicImage.m
@@ -39,9 +39,8 @@ - (instancetype)initWithLightImage:(UIImage *)lightImage darkImage:(UIImage *)da
 - (UIImage *)resolvedImage {
   if (DMTraitCollection.overrideTraitCollection.userInterfaceStyle == DMUserInterfaceStyleDark) {
     return self.darkImage;
-  } else {
-    return self.lightImage;
   }
+  return self.lightImage;
 }
 
 - (NSMethodSignature *)methodSignatureForSelector:(SEL)sel {
@@ -88,6 +87,13 @@ - (UIImage *)imageWithHorizontallyFlippedOrientation {
                                                           darkImage:[self.darkImage imageWithHorizontallyFlippedOrientation]];
 }
 
+- (UIImage *)imageWithConfiguration:(UIImageConfiguration *)configuration API_AVAILABLE(ios(13.0)) {
+  if (configuration.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+    return [_darkImage imageWithConfiguration:configuration];
+  }
+  return [_lightImage imageWithConfiguration:configuration];
+}
+
 - (id)copy {
   return [self copyWithZone:nil];
 }

diff --git a/Sources/DarkModeCore/UIImage+DarkModeKitSwizzling.m b/Sources/DarkModeCore/UIImage+DarkModeKitSwizzling.m
@@ -8,7 +8,7 @@
 
 @import ObjectiveC;
 
-static BOOL _useUIImageAsset = NO;
+static BOOL _useUIImageAsset = YES;
 
 @implementation UIImage (DarkModeKitSwizzling)
 
@@ -38,6 +38,8 @@ + (void)dm_swizzleIsEqual {
       }
       return ((BOOL(*)(UIImage *, SEL, UIImage *))imp)(realSelf, selector, realOther);
     }), method_getTypeEncoding(method));
+
+    _useUIImageAsset = NO;
   });
 }