xcbosa mbp16 1 年間 前
コミット
ead4f82d0a

+ 4 - 0
XCTheme/Classes/Impl/XCThemeService.m

@@ -10,6 +10,10 @@
 
 @xcmlservice(XCThemeProtocol, XCThemeService)
 
+- (UIUserInterfaceStyle)currentUserInterfaceStyle {
+    return XCThemeManager.shared.currentUserInterfaceStyle;
+}
+
 - (void)prepareThemeTarget:(nullable NSObject *)target block:(nullable void (^)(XCThemeSpecModel * _Nullable))block {
     [XCThemeManager.shared prepareThemeBlockWithTarget:target :^(XCThemeSpec * _Nullable theme) {
         XCThemeSpecModel * _Nullable wrappedModel = [[XCThemeSpecModel alloc] initWithWrappedObject:theme];

+ 7 - 0
XCTheme/Classes/Impl/XCThemeSpec.swift

@@ -90,6 +90,13 @@ extension XCThemeSpec {
         return UIColor(hexString: colorHex).withAlphaComponent(self.maskAlpha)
     }
     
+    public var blurStyle: String? {
+        guard let blurStyle = self.originalDict["blurStyle"] as? String else {
+            return nil
+        }
+        return blurStyle
+    }
+    
 }
 
 fileprivate extension UIColor {

+ 2 - 0
XCTheme/Classes/Module/XCThemeProtocol.h

@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol XCThemeProtocol <NSObject>
 
+@property (nonatomic, assign, readonly) UIUserInterfaceStyle currentUserInterfaceStyle;
+
 - (void)prepareThemeTarget:(nullable NSObject *)target block:(nullable void (^)(XCThemeSpecModel * _Nullable))block;
 
 @end

+ 1 - 0
XCTheme/Classes/Module/XCThemeSpecModel.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly, nullable) UIImage *backgroundImage;
 @property (nonatomic, strong, readonly, nullable) UIColor *maskColor;
 @property (nonatomic, assign, readonly) CGFloat maskAlpha;
+@property (nonatomic, copy, readonly, nullable) NSString *blurStyle;
 
 - (nullable instancetype)initWithWrappedObject:(id)object;
 

+ 4 - 0
XCTheme/Classes/Module/XCThemeSpecModel.m

@@ -46,4 +46,8 @@
     return self.wrappedObject.maskAlpha;
 }
 
+- (NSString *)blurStyle {
+    return self.wrappedObject.blurStyle;
+}
+
 @end