Reader tap zones

This commit is contained in:
schroda
2024-09-26 17:02:44 +02:00
parent 8e59763bba
commit 51fb660c7b
18 changed files with 623 additions and 13 deletions

View File

@@ -0,0 +1,21 @@
/*
* Copyright (C) Contributors to the Suwayomi project
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import { useMemo } from 'react';
import { IReaderSettings } from '@/modules/reader/types/Reader.types.ts';
import { useReaderStateMangaContext } from '@/modules/reader/contexts/state/ReaderStateMangaContext.tsx';
import { getReaderSettingsFor, useDefaultReaderSettings } from '@/modules/reader/services/ReaderSettingsMetadata.ts';
export class ReaderService {
static useSettings(): IReaderSettings {
const { manga } = useReaderStateMangaContext();
const { settings } = useDefaultReaderSettings();
return useMemo(() => getReaderSettingsFor(manga ?? { id: -1 }, settings), [manga, settings]);
}
}

View File

@@ -8,13 +8,38 @@
import { useEffect, useMemo } from 'react';
import { requestManager } from '@/lib/requests/RequestManager.ts';
import { DEFAULT_READER_SETTINGS } from '@/modules/reader/Reader.constants.ts';
import { IReaderSettings } from '@/modules/reader/Reader.types.ts';
import { DEFAULT_READER_SETTINGS } from '@/modules/reader/constants/Reader.constants.ts';
import { IReaderSettings } from '@/modules/reader/types/Reader.types.ts';
import { convertFromGqlMeta } from '@/modules/metadata/services/MetadataConverter.ts';
import { getMetadataFrom } from '@/modules/metadata/services/MetadataReader.ts';
import { GqlMetaHolder, Metadata, MetadataHolder, MetadataHolderType } from '@/modules/metadata/Metadata.types.ts';
import {
AllowedMetadataValueTypes,
AppMetadataKeys,
GqlMetaHolder,
Metadata,
MetadataHolder,
MetadataHolderType,
} from '@/modules/metadata/Metadata.types.ts';
import { jsonSaveParse } from '@/lib/HelperFunctions.ts';
import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
const convertSettingsToMetadata = (
settings: Partial<IReaderSettings>,
): Metadata<string, AllowedMetadataValueTypes> => ({
...settings,
tapZoneInvertMode: JSON.stringify(settings.tapZoneInvertMode),
});
const convertMetadataToSettings = (
metadata: Partial<Metadata<AppMetadataKeys, AllowedMetadataValueTypes>>,
defaultSettings: IReaderSettings,
): IReaderSettings => ({
...(metadata as unknown as IReaderSettings),
tapZoneInvertMode:
jsonSaveParse<IReaderSettings['tapZoneInvertMode']>((metadata.tapZoneInvertMode as string) ?? '') ??
defaultSettings.tapZoneInvertMode,
});
function getReaderSettingsWithDefaultValueFallback<DefaultSettings extends IReaderSettings>(
type: 'global',
metadataHolder: MetadataHolder,
@@ -33,13 +58,16 @@ function getReaderSettingsWithDefaultValueFallback<DefaultSettings extends IRead
defaultSettings: DefaultSettings = DEFAULT_READER_SETTINGS as DefaultSettings,
useEffectFn?: typeof useEffect,
): DefaultSettings {
return getMetadataFrom(
type as Parameters<typeof getMetadataFrom>[0],
metadataHolder as Parameters<typeof getMetadataFrom>[1],
defaultSettings,
true,
useEffectFn,
);
return convertMetadataToSettings(
getMetadataFrom(
type as Parameters<typeof getMetadataFrom>[0],
metadataHolder as Parameters<typeof getMetadataFrom>[1],
convertSettingsToMetadata(defaultSettings),
true,
useEffectFn,
),
defaultSettings as IReaderSettings,
) as DefaultSettings;
}
const getSettings = (

View File

@@ -0,0 +1,196 @@
/*
* Copyright (C) Contributors to the Suwayomi project
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import i18next, { t as translate } from 'i18next';
import { CSSProperties } from 'react';
import {
ReaderTapZoneRect,
TapZoneInvertMode,
TapZoneLayouts,
TapZoneRegion,
TapZoneRegionType,
} from '@/modules/reader/types/TapZoneLayout.types.ts';
import {
READER_TAP_ZONE_LAYOUTS,
TAP_ZONE_REGION_TYPE_DATA,
} from '@/modules/reader/constants/ReaderTapZone.constants.ts';
interface InvertMode extends TapZoneInvertMode {
isRTL: boolean;
}
export class ReaderTapZoneService {
private static layout: TapZoneLayouts | null = null;
private static canvas: HTMLCanvasElement | null = null;
private static width: number | null = null;
private static height: number | null = null;
private static language: string | null = null;
private static invertMode: InvertMode | null = null;
private static regions: TapZoneRegion[] | null = null;
private static fontStyle: CSSProperties | null = null;
private static invertVertical = ([x, y, width, height]: ReaderTapZoneRect): ReaderTapZoneRect => [
x,
100 - (y + height),
width,
height,
];
private static invertHorizontal = ([x, y, width, height]: ReaderTapZoneRect): ReaderTapZoneRect => [
100 - (x + width),
y,
width,
height,
];
private static invertRect(rect: ReaderTapZoneRect, { vertical, horizontal, isRTL }: InvertMode): ReaderTapZoneRect {
const rectInvertedVertical = vertical ? this.invertVertical(rect) : rect;
const rectInvertedHorizontal = horizontal ? this.invertHorizontal(rectInvertedVertical) : rectInvertedVertical;
return isRTL ? this.invertHorizontal(rectInvertedHorizontal) : rectInvertedHorizontal;
}
private static getRegions(layout: TapZoneLayouts, invertMode: InvertMode): TapZoneRegion[] {
const regions = READER_TAP_ZONE_LAYOUTS[layout];
return regions.map(({ type, rect }) => ({ type, rect: this.invertRect(rect, invertMode) }));
}
private static isCanvasReusable(
layout: TapZoneLayouts,
canvasWidth: number,
canvasHeight: number,
fontStyle: CSSProperties,
invertMode: InvertMode,
): boolean {
const isSameLayout = this.layout === layout;
const isSameWidth = this.width === canvasWidth;
const isSameHeight = this.height === canvasHeight;
const doesCanvasExist = !!this.canvas;
const isSameLanguage = this.language === i18next.language;
const isSameInvertMode =
this.invertMode?.vertical === invertMode.vertical &&
this.invertMode.horizontal === invertMode.horizontal &&
this.invertMode.isRTL === invertMode.isRTL;
const isSameFontStyle = this.fontStyle === fontStyle;
return (
doesCanvasExist &&
isSameWidth &&
isSameHeight &&
isSameLayout &&
isSameLanguage &&
isSameInvertMode &&
isSameFontStyle
);
}
private static drawCanvas(
context: CanvasRenderingContext2D,
canvasWidth: number,
canvasHeight: number,
fontStyle: CSSProperties,
regions: TapZoneRegion[],
): void {
regions.forEach(({ type, rect: [rectX, rectY, rectWidth, rectHeight] }) => {
const { text: translationKey, color } = TAP_ZONE_REGION_TYPE_DATA[type];
const text = translate(translationKey);
const calcActualValue = (value: number, size: number) => (value / 100) * size;
const x = calcActualValue(rectX, canvasWidth);
const y = calcActualValue(rectY, canvasHeight);
const width = calcActualValue(rectWidth, canvasWidth);
const height = calcActualValue(rectHeight, canvasHeight);
const calcRectCenter = (pos1: number, pos2: number) => (pos1 + pos2) * 0.5 + pos1 * 0.5;
const rectCenterX = calcRectCenter(x, width);
const rectCenterY = calcRectCenter(y, height);
context.beginPath();
context.rect(x, y, width, height);
context.fillStyle = color;
context.strokeStyle = color;
context.lineWidth = 0.1;
context.stroke();
context.fill();
context.strokeStyle = 'black';
context.textAlign = 'center';
context.textBaseline = 'middle';
context.font = `${fontStyle.fontSize} ${fontStyle.fontFamily}`;
context.strokeStyle = 'black';
context.lineWidth = 3;
context.strokeText(text, rectCenterX, rectCenterY);
context.lineWidth = 1;
context.fillStyle = 'white';
context.fillText(text, rectCenterX, rectCenterY);
});
}
static getOrCreateCanvas(
layout: TapZoneLayouts,
canvasWidth: number,
canvasHeight: number,
fontStyle: CSSProperties,
invertMode: InvertMode,
): HTMLCanvasElement {
if (this.isCanvasReusable(layout, canvasWidth, canvasHeight, fontStyle, invertMode)) {
return this.canvas!;
}
const canvas = document.createElement('canvas');
const context = canvas.getContext('2d')!;
context.canvas.width = canvasWidth;
context.canvas.height = canvasHeight;
const regions = this.getRegions(layout, invertMode);
this.drawCanvas(context, canvasWidth, canvasHeight, fontStyle, regions);
this.layout = layout;
this.canvas = canvas;
this.width = canvasWidth;
this.height = canvasHeight;
this.language = i18next.language;
this.invertMode = invertMode;
this.regions = regions;
this.fontStyle = fontStyle;
return canvas;
}
private static doesRegionContainPos(region: TapZoneRegion, x: number, y: number): boolean {
const [rectX, rectY, width, height] = region.rect;
return x >= rectX && x <= rectX + width && y >= rectY && y <= rectY + height;
}
static getAction(x: number, y: number): TapZoneRegionType {
const xPercentage = (x / this.width!) * 100;
const yPercentage = (y / this.height!) * 100;
const region = this.regions?.find((regionToCheck) =>
this.doesRegionContainPos(regionToCheck, xPercentage, yPercentage),
);
if (region) {
return region.type;
}
return TapZoneRegionType.MENU;
}
}