This is an automated email from the ASF dual-hosted git repository.
jianhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new df95e7b [iOS] Add dark scheme module for each instance. Add
invertingBehavior for more precise control of each instance for dark scheme
auto-inverting.
new e4a96de Merge pull request #3050 from wqyfavor/dark-invert-page-logic
df95e7b is described below
commit df95e7b9fd9aee5378e45a54b7fefdd7b8501433
Author: qianyuan.wqy <[email protected]>
AuthorDate: Tue Dec 3 13:34:13 2019 +0800
[iOS] Add dark scheme module for each instance. Add invertingBehavior for
more precise control of each instance for dark scheme auto-inverting.
---
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 12 +++++
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 2 +
.../WeexSDK/Sources/Manager/WXComponentManager.mm | 12 ++++-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 21 +++++++++
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 10 +++++
.../WeexSDK/Sources/Model/WXSDKInstance_private.h | 1 +
.../WeexSDK/Sources/Module/WXDarkSchemeModule.h | 27 +++++++++++
.../WeexSDK/Sources/Module/WXDarkSchemeModule.m | 52 ++++++++++++++++++++++
8 files changed, 136 insertions(+), 1 deletion(-)
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 8e2a0b1..4d18eaa 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -618,6 +618,10 @@
D735F1B222D761F800B53CDF /* log_utils.cpp in Sources */ = {isa
= PBXBuildFile; fileRef = D735F1AC22D761F800B53CDF /* log_utils.cpp */; };
D735F1B322D761F800B53CDF /* log_utils.cpp in Sources */ = {isa
= PBXBuildFile; fileRef = D735F1AC22D761F800B53CDF /* log_utils.cpp */; };
D77286FF22C9B22C00E1DA7D /* eagle_bridge.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = BD9205FA223651D800EDF93D /* eagle_bridge.cpp */;
};
+ D7D15AF723960F5D0024BC33 /* WXDarkSchemeModule.m in Sources */
= {isa = PBXBuildFile; fileRef = D7D15AF523960F5C0024BC33 /*
WXDarkSchemeModule.m */; };
+ D7D15AF823960F5D0024BC33 /* WXDarkSchemeModule.m in Sources */
= {isa = PBXBuildFile; fileRef = D7D15AF523960F5C0024BC33 /*
WXDarkSchemeModule.m */; };
+ D7D15AF923960F5D0024BC33 /* WXDarkSchemeModule.h in Headers */
= {isa = PBXBuildFile; fileRef = D7D15AF623960F5D0024BC33 /*
WXDarkSchemeModule.h */; };
+ D7D15AFA23960F5D0024BC33 /* WXDarkSchemeModule.h in Headers */
= {isa = PBXBuildFile; fileRef = D7D15AF623960F5D0024BC33 /*
WXDarkSchemeModule.h */; };
D7D6B6E2238E1B1D00BE56DD /* WXDarkSchemeProtocol.h in Headers
*/ = {isa = PBXBuildFile; fileRef = D7D6B6E1238E1B1D00BE56DD /*
WXDarkSchemeProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
D7D6B6E3238E1B1D00BE56DD /* WXDarkSchemeProtocol.h in Headers
*/ = {isa = PBXBuildFile; fileRef = D7D6B6E1238E1B1D00BE56DD /*
WXDarkSchemeProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
D7D6B6E6238E1B2A00BE56DD /* WXDarkSchemeDefaultImpl.m in
Sources */ = {isa = PBXBuildFile; fileRef = D7D6B6E4238E1B2A00BE56DD /*
WXDarkSchemeDefaultImpl.m */; };
@@ -1357,6 +1361,8 @@
D3FC0DF61C508B2A002B9E31 /* WXTimerModule.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXTimerModule.m; sourceTree = "<group>"; };
D735F1AB22D761F800B53CDF /* log_utils.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
log_utils.h; sourceTree = "<group>"; };
D735F1AC22D761F800B53CDF /* log_utils.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = log_utils.cpp; sourceTree = "<group>"; };
+ D7D15AF523960F5C0024BC33 /* WXDarkSchemeModule.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXDarkSchemeModule.m; sourceTree = "<group>"; };
+ D7D15AF623960F5D0024BC33 /* WXDarkSchemeModule.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXDarkSchemeModule.h; sourceTree = "<group>"; };
D7D6B6E1238E1B1D00BE56DD /* WXDarkSchemeProtocol.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXDarkSchemeProtocol.h; sourceTree = "<group>"; };
D7D6B6E4238E1B2A00BE56DD /* WXDarkSchemeDefaultImpl.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = WXDarkSchemeDefaultImpl.m; sourceTree = "<group>"; };
D7D6B6E5238E1B2A00BE56DD /* WXDarkSchemeDefaultImpl.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= WXDarkSchemeDefaultImpl.h; sourceTree = "<group>"; };
@@ -1949,6 +1955,8 @@
77E659D71C07F585008B8775 /* Module */ = {
isa = PBXGroup;
children = (
+ D7D15AF623960F5D0024BC33 /*
WXDarkSchemeModule.h */,
+ D7D15AF523960F5C0024BC33 /*
WXDarkSchemeModule.m */,
7704894622AA358400E7606F /*
WXConsoleLogModule.h */,
BD35ADE92303BEA60050ED82 /*
WXConsoleLogModule.mm */,
BA5F00EF1FC5AFFE00F76B5C /* WXLocaleModule.h */,
@@ -2630,6 +2638,7 @@
B8D66CA921255730003960BD /* wson_util.h in
Headers */,
7704894822AA358500E7606F /*
WXConsoleLogModule.h in Headers */,
B8D66C8B21255730003960BD /*
render_list_factory.h in Headers */,
+ D7D15AF923960F5D0024BC33 /*
WXDarkSchemeModule.h in Headers */,
745B2D681E5A8E1E0092D38A /*
WXMultiColumnLayout.h in Headers */,
B89543F720EB18B5006EAD63 /* WXCoreBridge.h in
Headers */,
2A60CE9C1C91733E00857B9F /* WXSwitchComponent.h
in Headers */,
@@ -2838,6 +2847,7 @@
B8D66C3E21255730003960BD /*
render_action_createfinish.h in Headers */,
DCA445F21EFA5A2300D0CFA8 /* WXHeaderComponent.h
in Headers */,
DCA445DD1EFA59B300D0CFA8 /*
WXRecyclerUpdateController.h in Headers */,
+ D7D15AFA23960F5D0024BC33 /*
WXDarkSchemeModule.h in Headers */,
DCA4461E1EFA5AAF00D0CFA8 /*
WXComponentFactory.h in Headers */,
33CE190F2153443000CF9670 /*
WXJSFrameworkLoadDefaultImpl.h in Headers */,
B87B9E7E21539B3300B6DC61 /* WXVersion.h in
Headers */,
@@ -3334,6 +3344,7 @@
742AD72F1DF98C45007DC46C /* WXResourceRequest.m
in Sources */,
7461F8931CFB373100F62D44 /* WXLayer.m in
Sources */,
74D205211E091B8000128F44 /* WXCallJSMethod.m in
Sources */,
+ D7D15AF723960F5D0024BC33 /*
WXDarkSchemeModule.m in Sources */,
BD88C14522F02120004467AA /*
render_action_update_richtext_child_attr.cpp in Sources */,
C41E1A981DC1FD15009C7F90 /*
WXDatePickerManager.m in Sources */,
BDEEADBA22F2902E0099F1D7 /* time_calculator.cpp
in Sources */,
@@ -3526,6 +3537,7 @@
DCA445931EFA55B300D0CFA8 /*
WXComponentManager.mm in Sources */,
DCA445941EFA55B300D0CFA8 /*
WXComponentFactory.m in Sources */,
DCA445951EFA55B300D0CFA8 /* WXRuleManager.m in
Sources */,
+ D7D15AF823960F5D0024BC33 /*
WXDarkSchemeModule.m in Sources */,
BD88C14622F02120004467AA /*
render_action_update_richtext_child_attr.cpp in Sources */,
DCA445961EFA55B300D0CFA8 /* WXMonitor.m in
Sources */,
BDEEADBB22F2902E0099F1D7 /* time_calculator.cpp
in Sources */,
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
index 2039300..993e427 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -43,6 +43,7 @@
#import "WXConfigCenterProtocol.h"
#import "WXComponent+Layout.h"
#import "WXCoreBridge.h"
+#import "WXDarkSchemeModule.h"
@implementation WXSDKEngine
@@ -69,6 +70,7 @@
[self registerModule:@"webSocket"
withClass:NSClassFromString(@"WXWebSocketModule")];
[self registerModule:@"voice-over"
withClass:NSClassFromString(@"WXVoiceOverModule")];
[self registerModule:@"sdk-console-log"
withClass:NSClassFromString(@"WXConsoleLogModule")];
+ [self registerModule:@"dark-scheme"
withClass:NSClassFromString(@"WXDarkSchemeModule")];
}
+ (void)registerModule:(NSString *)name withClass:(Class)clazz
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
index 3f228ee..6fa35be 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
@@ -43,6 +43,7 @@
#import "WXAnalyzerCenter.h"
#import "WXDisplayLinkManager.h"
#import "WXDarkSchemeProtocol.h"
+#import "WXSDKInstance_private.h"
static NSThread *WXComponentThread;
@@ -264,7 +265,16 @@ static NSThread *WXComponentThread;
if ([WXUtility isDarkSchemeSupportEnabled]) {
if (attributes[@"invertForDarkScheme"] == nil) {
- _rootComponent.invertForDarkScheme = [[WXSDKInstance
darkSchemeColorHandler] defaultInvertValueForRootComponent];
+ WXAutoInvertingBehavior invertingBehavior =
_weexInstance.autoInvertingBehavior;
+ if (invertingBehavior == WXAutoInvertingBehaviorDefault) {
+ _rootComponent.invertForDarkScheme = [[WXSDKInstance
darkSchemeColorHandler] defaultInvertValueForRootComponent];
+ }
+ else if (invertingBehavior == WXAutoInvertingBehaviorAlways) {
+ _rootComponent.invertForDarkScheme = YES;
+ }
+ else {
+ _rootComponent.invertForDarkScheme = NO;
+ }
}
}
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
index 088d8ac..e7d4fb1 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
@@ -451,6 +451,27 @@ typedef enum : NSUInteger {
#pragma mark - Scheme Support
+typedef enum : NSUInteger {
+ WXAutoInvertingBehaviorDefault,
+ WXAutoInvertingBehaviorAlways,
+ WXAutoInvertingBehaviorNever,
+} WXAutoInvertingBehavior;
+
+/**
+ Set auto-inverting behavior for dark scheme.
+ WXAutoInvertingBehaviorDefault: Use components attribute and
+ defaultInvertValueForRootComponent of WXDarkSchemeProtocol.
+ WXAutoInvertingBehaviorAlways: Always set 'autoInvertForDarkScheme' as
+ true for root component.
+ WXAutoInvertingBehaviorNever: Always set 'autoInvertForDarkScheme' as
+ false for root component.
+
+ This function should be called before rendering URL.
+
+ @return Handler instance.
+*/
+- (void)setAutoInvertingBehavior:(WXAutoInvertingBehavior)behavior;
+
/**
Handler for handling color invert.
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 70c7493..a71960f 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -53,6 +53,7 @@
#import "WXCoreBridge.h"
#import "WXDataRenderHandler.h"
#import "WXDarkSchemeProtocol.h"
+#import "WXDarkSchemeModule.h"
#define WEEX_LITE_URL_SUFFIX @"wlasm"
#define WEEX_RENDER_TYPE_PLATFORM @"platform"
@@ -110,6 +111,7 @@ typedef enum : NSUInteger {
self.schemeName = @"light";
}
+ _autoInvertingBehavior = WXAutoInvertingBehaviorDefault;
_renderType = renderType;
_appearState = YES;
@@ -1185,6 +1187,11 @@ typedef enum : NSUInteger {
return result;
}
+- (void)setAutoInvertingBehavior:(WXAutoInvertingBehavior)behavior
+{
+ _autoInvertingBehavior = behavior;
+}
+
+ (id<WXDarkSchemeProtocol>)darkSchemeColorHandler
{
static id<WXDarkSchemeProtocol> colorHandler;
@@ -1219,6 +1226,9 @@ typedef enum : NSUInteger {
return;
}
+ WXDarkSchemeModule* darkSchemeModule = [self
moduleForClass:[WXDarkSchemeModule class]];
+ [darkSchemeModule onInstanceSchemeChanged];
+
// Recursively visit all components and notify that scheme had changed.
__weak WXSDKInstance* weakSelf = self;
WXPerformBlockOnComponentThread(^{
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance_private.h
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance_private.h
index d3811c7..30cd209 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance_private.h
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance_private.h
@@ -39,6 +39,7 @@
@property (nonatomic, strong) NSString *createInstanceContextResult;
@property (nonatomic, strong) NSString *executeRaxApiResult;
+@property (nonatomic, assign) WXAutoInvertingBehavior autoInvertingBehavior;
@property (atomic, strong) NSString* schemeName;
- (void)addModuleEventObservers:(NSString*)event
callback:(NSString*)callbackId option:(NSDictionary*)option
moduleClassName:(NSString*)moduleClassName;
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXDarkSchemeModule.h
b/ios/sdk/WeexSDK/Sources/Module/WXDarkSchemeModule.h
new file mode 100644
index 0000000..fce05b4
--- /dev/null
+++ b/ios/sdk/WeexSDK/Sources/Module/WXDarkSchemeModule.h
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#import <Foundation/Foundation.h>
+#import "WXModuleProtocol.h"
+
+@interface WXDarkSchemeModule : NSObject <WXModuleProtocol>
+
+- (void)onInstanceSchemeChanged;
+
+@end
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXDarkSchemeModule.m
b/ios/sdk/WeexSDK/Sources/Module/WXDarkSchemeModule.m
new file mode 100644
index 0000000..92d268f
--- /dev/null
+++ b/ios/sdk/WeexSDK/Sources/Module/WXDarkSchemeModule.m
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#import "WXDarkSchemeModule.h"
+#import "WXSDKInstance_private.h"
+
+@implementation WXDarkSchemeModule
+{
+ WXModuleKeepAliveCallback _schemeChangedCallback;
+}
+
+@synthesize weexInstance;
+
+WX_EXPORT_METHOD_SYNC(@selector(isUsingDarkScheme))
+WX_EXPORT_METHOD(@selector(registerSchemeChangeListener:))
+
+- (BOOL)isUsingDarkScheme
+{
+ return [self.weexInstance isDarkScheme];
+}
+
+- (void)registerSchemeChangeListener:(WXModuleKeepAliveCallback)callback
+{
+ _schemeChangedCallback = callback;
+}
+
+- (void)onInstanceSchemeChanged
+{
+ if (_schemeChangedCallback) {
+ _schemeChangedCallback(@{@"instanceId":
self.weexInstance.instanceId?:@"",
+ @"scheme":
self.weexInstance.schemeName?:@"light"},
+ YES);
+ }
+}
+
+@end
