From 7dfd7b9ca2bb86496806f5e0596a60f32d099a7e Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Fri, 7 Feb 2025 22:35:24 +0100 Subject: [PATCH] mobile: fix hasSafeAreaInset as PWA is only for WebAppService (#314) --- apps/readest-app/src/services/nativeAppService.ts | 3 +-- apps/readest-app/src/services/webAppService.ts | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/readest-app/src/services/nativeAppService.ts b/apps/readest-app/src/services/nativeAppService.ts index b0c014f4..9e355c43 100644 --- a/apps/readest-app/src/services/nativeAppService.ts +++ b/apps/readest-app/src/services/nativeAppService.ts @@ -22,7 +22,6 @@ import { isValidURL } from '@/utils/misc'; import { BaseAppService } from './appService'; import { LOCAL_BOOKS_SUBDIR } from './constants'; -import { isPWA } from './environment'; const OS_TYPE = osType(); @@ -125,7 +124,7 @@ export class NativeAppService extends BaseAppService { hasWindowBar = !(OS_TYPE === 'ios' || OS_TYPE === 'android'); hasContextMenu = !(OS_TYPE === 'ios' || OS_TYPE === 'android'); hasRoundedWindow = !(OS_TYPE === 'ios' || OS_TYPE === 'android'); - hasSafeAreaInset = OS_TYPE === 'ios' || OS_TYPE === 'android' || isPWA(); + hasSafeAreaInset = OS_TYPE === 'ios' || OS_TYPE === 'android'; override resolvePath(fp: string, base: BaseDir): { baseDir: number; base: BaseDir; fp: string } { return resolvePath(fp, base); diff --git a/apps/readest-app/src/services/webAppService.ts b/apps/readest-app/src/services/webAppService.ts index 70788c1b..d454ee79 100644 --- a/apps/readest-app/src/services/webAppService.ts +++ b/apps/readest-app/src/services/webAppService.ts @@ -3,6 +3,7 @@ import { ToastType, FileSystem, BaseDir, AppPlatform } from '@/types/system'; import { getCoverFilename } from '@/utils/book'; import { isValidURL } from '@/utils/misc'; +import { isPWA } from './environment'; import { BaseAppService } from './appService'; import { LOCAL_BOOKS_SUBDIR } from './constants'; @@ -185,7 +186,7 @@ export class WebAppService extends BaseAppService { hasWindowBar = false; hasContextMenu = false; hasRoundedWindow = false; - hasSafeAreaInset = false; + hasSafeAreaInset = isPWA(); override resolvePath(fp: string, base: BaseDir): { baseDir: number; base: BaseDir; fp: string } { return resolvePath(fp, base);