From 1dd1dbb54337b6055108fbd62a8755f37038a3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 23 Nov 2022 16:41:22 +0100 Subject: [PATCH 1/2] MOBILE-4081 styles: Apply same styles of searchbar to iOS --- src/theme/theme.light.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss index ad636a10b..1fe1969b7 100644 --- a/src/theme/theme.light.scss +++ b/src/theme/theme.light.scss @@ -187,7 +187,8 @@ html { --ion-searchbar-height: var(--a11y-min-target-size); --ion-searchbar-color: var(--text-color); --ion-searchbar-icon-color: var(--core-input-stroke); - ion-searchbar { + ion-searchbar, + .ios ion-searchbar { --background: var(--ion-searchbar-background); --border-color: var(--ion-searchbar-border-color); --color: var(--ion-searchbar-color); From 1f1e786ad51a81f1373b44fe8c16b80127808534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 23 Nov 2022 16:41:52 +0100 Subject: [PATCH 2/2] MOBILE-4081 swipe: Only enable swipe when items are loaded --- src/core/directives/swipe-navigation.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/directives/swipe-navigation.ts b/src/core/directives/swipe-navigation.ts index 1a5584a5f..2a2019cc7 100644 --- a/src/core/directives/swipe-navigation.ts +++ b/src/core/directives/swipe-navigation.ts @@ -73,11 +73,8 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy { this.onRelease(ev); }, }); - this.swipeGesture.enable(); - // Show user tour. const source = this.manager?.getSource(); - if (!source) { return; } @@ -85,11 +82,13 @@ export class CoreSwipeNavigationDirective implements AfterViewInit, OnDestroy { await source.waitForLoaded(); const items = source.getItems() ?? []; - if (!this.enabled || items.length < 2) { return; } + this.swipeGesture.enable(); + + // Show user tour. await CoreUserTours.showIfPending({ id: 'swipe-navigation', component: CoreSwipeNavigationTourComponent,