Skip to content

feat(ios): Added activity indicator iosIndicatorViewStyle property #10650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2025
Merged

feat(ios): Added activity indicator iosIndicatorViewStyle property #10650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7301536
feat(ios): Added activity indicator iosIndicatorViewStyle property
CatchABus Nov 14, 2024
f924d94
Merge branch 'main' into feat/ios-activity-indicator-style
NathanWalker Nov 19, 2024
412c1f8
Merge branch 'main' into feat/ios-activity-indicator-style
NathanWalker Feb 18, 2025
e33c688
Merge branch 'main' into feat/ios-activity-indicator-style
NathanWalker Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/core/ui/activity-indicator/activity-indicator-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { ActivityIndicator as ActivityIndicatorDefinition } from '.';
import { ActivityIndicator as ActivityIndicatorDefinition, IOSIndicatorViewStyle } from '.';
import { View, CSSType } from '../core/view';
import { booleanConverter } from '../core/view-base';
import { Property } from '../core/properties';

@CSSType('ActivityIndicator')
export class ActivityIndicatorBase extends View implements ActivityIndicatorDefinition {
public busy: boolean;
public iosIndicatorViewStyle: IOSIndicatorViewStyle;
}

ActivityIndicatorBase.prototype.recycleNativeView = 'auto';
Expand All @@ -16,3 +17,9 @@ export const busyProperty = new Property<ActivityIndicatorBase, boolean>({
valueConverter: booleanConverter,
});
busyProperty.register(ActivityIndicatorBase);

export const iosIndicatorViewStyleProperty = new Property<ActivityIndicatorBase, IOSIndicatorViewStyle>({
name: 'iosIndicatorViewStyle',
defaultValue: 'medium',
});
iosIndicatorViewStyleProperty.register(ActivityIndicatorBase);
7 changes: 7 additions & 0 deletions packages/core/ui/activity-indicator/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { View } from '../core/view';

export type IOSIndicatorViewStyle = 'medium' | 'large';

/**
* Represents a UI widget which displays a progress indicator hinting the user for some background operation running.
*
Expand All @@ -22,4 +24,9 @@ export class ActivityIndicator extends View {
* @nsProperty
*/
busy: boolean;

/**
* Gets or sets the iOS indicator view style (e.g. medium, large).
*/
iosIndicatorViewStyle: IOSIndicatorViewStyle;
}
33 changes: 24 additions & 9 deletions packages/core/ui/activity-indicator/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { ActivityIndicatorBase, busyProperty } from './activity-indicator-common';
import { ActivityIndicatorBase, busyProperty, iosIndicatorViewStyleProperty } from './activity-indicator-common';
import { colorProperty } from '../styling/style-properties';
import { Color } from '../../color';
import { iOSNativeHelper } from '../../utils';
import { IOSIndicatorViewStyle } from '.';

export * from './activity-indicator-common';

Expand All @@ -10,10 +11,8 @@ const majorVersion = iOSNativeHelper.MajorVersion;
export class ActivityIndicator extends ActivityIndicatorBase {
nativeViewProtected: UIActivityIndicatorView;

private _activityIndicatorViewStyle = majorVersion <= 12 || !UIActivityIndicatorViewStyle.Medium ? UIActivityIndicatorViewStyle.Gray : UIActivityIndicatorViewStyle.Medium;

createNativeView() {
const viewStyle = this._activityIndicatorViewStyle;
const viewStyle = this._getNativeIndicatorViewStyle(this.iosIndicatorViewStyle);
const view = UIActivityIndicatorView.alloc().initWithActivityIndicatorStyle(viewStyle);
view.hidesWhenStopped = true;

Expand All @@ -25,15 +24,27 @@ export class ActivityIndicator extends ActivityIndicatorBase {
return this.nativeViewProtected;
}

[busyProperty.getDefault](): boolean {
if ((<any>this.nativeViewProtected).isAnimating) {
return (<any>this.nativeViewProtected).isAnimating();
} else {
return this.nativeViewProtected.animating;
private _getNativeIndicatorViewStyle(value: IOSIndicatorViewStyle): UIActivityIndicatorViewStyle {
let viewStyle: UIActivityIndicatorViewStyle;

switch (value) {
case 'large':
viewStyle = majorVersion > 12 ? UIActivityIndicatorViewStyle.Large : UIActivityIndicatorViewStyle.WhiteLarge;
break;
default:
viewStyle = majorVersion > 12 ? UIActivityIndicatorViewStyle.Medium : UIActivityIndicatorViewStyle.Gray;
break;
}

return viewStyle;
}

[busyProperty.getDefault](): boolean {
return this.nativeViewProtected.animating;
}
[busyProperty.setNative](value: boolean) {
const nativeView = this.nativeViewProtected;

if (value) {
nativeView.startAnimating();
} else {
Expand All @@ -51,4 +62,8 @@ export class ActivityIndicator extends ActivityIndicatorBase {
[colorProperty.setNative](value: UIColor | Color) {
this.nativeViewProtected.color = value instanceof Color ? value.ios : value;
}

[iosIndicatorViewStyleProperty.setNative](value: IOSIndicatorViewStyle) {
this.nativeViewProtected.activityIndicatorViewStyle = this._getNativeIndicatorViewStyle(value);
}
}
Loading