From 6271c6b95785265597488b5fd2895084ca4501ec Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Wed, 11 Sep 2019 10:03:21 +0300 Subject: [PATCH] fix(dark-mode): activity indicator --- .../activity-indicator.ios.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts b/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts index 4d5776fa0..59e7e9067 100644 --- a/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts +++ b/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts @@ -2,11 +2,22 @@ import { ActivityIndicatorBase, busyProperty, colorProperty, Color } from "./act export * from "./activity-indicator-common"; +import { ios } from "../../utils/utils"; + +const majorVersion = ios.MajorVersion; + export class ActivityIndicator extends ActivityIndicatorBase { nativeViewProtected: UIActivityIndicatorView; - + createNativeView() { - const view = UIActivityIndicatorView.alloc().initWithActivityIndicatorStyle(UIActivityIndicatorViewStyle.Gray); + let viewStyle; + if (majorVersion <= 12) { + viewStyle = UIActivityIndicatorViewStyle.Gray; + } else { + viewStyle = UIActivityIndicatorViewStyle.Medium; + } + + const view = UIActivityIndicatorView.alloc().initWithActivityIndicatorStyle(viewStyle); view.hidesWhenStopped = true; return view; @@ -43,4 +54,4 @@ export class ActivityIndicator extends ActivityIndicatorBase { [colorProperty.setNative](value: UIColor | Color) { this.nativeViewProtected.color = value instanceof Color ? value.ios : value; } -} \ No newline at end of file +}