From 072070930991e8f9eb2db61231d98192a66f3a24 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Tue, 2 Jul 2024 11:51:17 -0700 Subject: [PATCH 1/3] fix(ios): symbol effects wip --- apps/toolbox/src/pages/image-handling.ts | 8 ++++---- apps/toolbox/src/pages/image-handling.xml | 12 ++++++------ packages/core/ui/image/index.ios.ts | 3 ++- packages/core/ui/image/symbol-effects.android.ts | 11 +++++------ packages/core/ui/image/symbol-effects.ios.ts | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/toolbox/src/pages/image-handling.ts b/apps/toolbox/src/pages/image-handling.ts index 563498f1fa..7dd8a98f10 100644 --- a/apps/toolbox/src/pages/image-handling.ts +++ b/apps/toolbox/src/pages/image-handling.ts @@ -10,10 +10,10 @@ export function navigatingTo(args: EventData) { export class DemoModel extends Observable { addingPhoto = false; - symbolWiggleEffect: ImageSymbolEffects.Wiggle; - symbolBounceEffect: ImageSymbolEffects.Bounce; - symbolBreathEffect: ImageSymbolEffects.Breathe; - symbolRotateEffect: ImageSymbolEffects.Rotate; + symbolWiggleEffect = ImageSymbolEffects.Scale; + symbolBounceEffect = ImageSymbolEffects.Bounce; + symbolBreathEffect = ImageSymbolEffects.Breathe; + symbolRotateEffect = ImageSymbolEffects.Rotate; pickImage() { const context = create({ diff --git a/apps/toolbox/src/pages/image-handling.xml b/apps/toolbox/src/pages/image-handling.xml index ad735e19b8..bd72a64ba5 100644 --- a/apps/toolbox/src/pages/image-handling.xml +++ b/apps/toolbox/src/pages/image-handling.xml @@ -14,15 +14,15 @@ -

diff --git a/packages/core/ui/image/index.ios.ts b/packages/core/ui/image/index.ios.ts index cf3d0d179c..817597d864 100644 --- a/packages/core/ui/image/index.ios.ts +++ b/packages/core/ui/image/index.ios.ts @@ -201,7 +201,8 @@ export class Image extends ImageBase { return; } const symbol = typeof value === 'string' ? ImageSymbolEffect.fromSymbol(value) : value; - if (symbol && symbol.effect) { + if (symbol?.effect) { + console.log('symbol.effect:', symbol.effect); this.nativeViewProtected.addSymbolEffectOptionsAnimatedCompletion(symbol.effect, symbol.options || NSSymbolEffectOptions.optionsWithRepeating(), true, symbol.completion || null); } else { this.nativeViewProtected.removeAllSymbolEffects(); diff --git a/packages/core/ui/image/symbol-effects.android.ts b/packages/core/ui/image/symbol-effects.android.ts index 27eff8434d..bd02f2736c 100644 --- a/packages/core/ui/image/symbol-effects.android.ts +++ b/packages/core/ui/image/symbol-effects.android.ts @@ -1,9 +1,8 @@ -import { ImageSymbolEffectCommon, ImageSymbolEffects } from './symbol-effects-common'; -import type { ImageSymbolEffect as ImageSymbolEffectDefinition } from './symbol-effects.d.ts'; -export { ImageSymbolEffects }; +import { ImageSymbolEffectCommon } from './symbol-effects-common'; +export { ImageSymbolEffects } from './symbol-effects-common'; -export const ImageSymbolEffect: typeof ImageSymbolEffectDefinition = class ImageSymbolEffect extends ImageSymbolEffectCommon implements ImageSymbolEffectDefinition { - static fromSymbol(symbol: string): ImageSymbolEffectDefinition { +export class ImageSymbolEffect extends ImageSymbolEffectCommon { + static fromSymbol(symbol: string) { return new ImageSymbolEffect(); } -}; +} diff --git a/packages/core/ui/image/symbol-effects.ios.ts b/packages/core/ui/image/symbol-effects.ios.ts index 0ae1bfee7b..96c544397b 100644 --- a/packages/core/ui/image/symbol-effects.ios.ts +++ b/packages/core/ui/image/symbol-effects.ios.ts @@ -1,13 +1,13 @@ import { SDK_VERSION } from '../../utils/constants'; import { ImageSymbolEffectCommon, ImageSymbolEffects } from './symbol-effects-common'; -import type { ImageSymbolEffect as ImageSymbolEffectDefinition } from './symbol-effects.d.ts'; +export { ImageSymbolEffects } from './symbol-effects-common'; -export const ImageSymbolEffect: typeof ImageSymbolEffectDefinition = class ImageSymbolEffect extends ImageSymbolEffectCommon implements ImageSymbolEffectDefinition { +export class ImageSymbolEffect extends ImageSymbolEffectCommon { constructor(symbol: NSSymbolEffect) { super(); this.effect = symbol; } - static fromSymbol(symbol: string): ImageSymbolEffectDefinition | null { + static fromSymbol(symbol: string): ImageSymbolEffect | null { if (SDK_VERSION < 17) { return null; } @@ -92,4 +92,4 @@ export const ImageSymbolEffect: typeof ImageSymbolEffectDefinition = class Image return null; } -}; +} From 71ac975715f65f7f615ab903b83f60ea119c2341 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Tue, 2 Jul 2024 11:52:22 -0700 Subject: [PATCH 2/3] fix(ios): symbol effects wip --- apps/toolbox/src/pages/image-handling.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox/src/pages/image-handling.ts b/apps/toolbox/src/pages/image-handling.ts index 7dd8a98f10..5feea4f469 100644 --- a/apps/toolbox/src/pages/image-handling.ts +++ b/apps/toolbox/src/pages/image-handling.ts @@ -10,7 +10,7 @@ export function navigatingTo(args: EventData) { export class DemoModel extends Observable { addingPhoto = false; - symbolWiggleEffect = ImageSymbolEffects.Scale; + symbolWiggleEffect = ImageSymbolEffects.Wiggle; symbolBounceEffect = ImageSymbolEffects.Bounce; symbolBreathEffect = ImageSymbolEffects.Breathe; symbolRotateEffect = ImageSymbolEffects.Rotate; From 362bb7936664425994703da0a1709bbf4dee2ca3 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Tue, 2 Jul 2024 11:59:33 -0700 Subject: [PATCH 3/3] fix(ios): symbol effects wip --- packages/core/ui/image/symbol-effects.ios.ts | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/core/ui/image/symbol-effects.ios.ts b/packages/core/ui/image/symbol-effects.ios.ts index 96c544397b..dbf937475f 100644 --- a/packages/core/ui/image/symbol-effects.ios.ts +++ b/packages/core/ui/image/symbol-effects.ios.ts @@ -44,49 +44,34 @@ export class ImageSymbolEffect extends ImageSymbolEffectCommon { if (SDK_VERSION < 18) { return null; } - // TODO: remove ts-expect-error once we bump the types package switch (symbol) { case ImageSymbolEffects.Breathe: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolBreatheEffect.effect()); case ImageSymbolEffects.BreathePlain: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolBreatheEffect.breathePlainEffect()); case ImageSymbolEffects.Rotate: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolRotateEffect.effect()); case ImageSymbolEffects.RotateClockwise: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolRotateEffect.rotateClockwiseEffect()); case ImageSymbolEffects.RotateCounterClockwise: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolRotateEffect.rotateCounterClockwiseEffect()); case ImageSymbolEffects.Wiggle: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.effect()); case ImageSymbolEffects.WiggleBackward: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleBackwardEffect()); case ImageSymbolEffects.WiggleClockwise: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleClockwiseEffect()); case ImageSymbolEffects.WiggleCounterClockwise: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleCounterClockwiseEffect()); case ImageSymbolEffects.WiggleDown: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleDownEffect()); case ImageSymbolEffects.WiggleForward: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleForwardEffect()); case ImageSymbolEffects.WiggleUp: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleUpEffect()); case ImageSymbolEffects.WiggleLeft: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleLeftEffect()); case ImageSymbolEffects.WiggleRight: - // @ts-expect-error added on iOS 18 return new ImageSymbolEffect(NSSymbolWiggleEffect.wiggleRightEffect()); } pFad - Phonifier reborn

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.