Fixes

OpenDTU-App · Dec 18, 2024 · 76a6350 · 76a6350
1 parent 15af4c2
commit 76a6350
Show file tree

Hide file tree

Showing 7 changed files with 337 additions and 19 deletions.
diff --git a/patches/patch-package+8.0.0.patch b/patches/patch-package+8.0.0.patch
@@ -0,0 +1,31 @@
+diff --git a/node_modules/patch-package/dist/makePatch.js b/node_modules/patch-package/dist/makePatch.js
+index d8d0925..9b25269 100644
+--- a/node_modules/patch-package/dist/makePatch.js
++++ b/node_modules/patch-package/dist/makePatch.js
+@@ -109,7 +109,7 @@ function makePatch({ packagePathSpecifier, appPath, packageManager, includePaths
+             resolutions: resolveRelativeFileDependencies_1.resolveRelativeFileDependencies(appPath, appPackageJson.resolutions || {}),
+         }));
+         const packageVersion = getPackageVersion_1.getPackageVersion(path_1.join(path_1.resolve(packageDetails.path), "package.json"));
+-        [".npmrc", ".yarnrc", ".yarn"].forEach((rcFile) => {
++        [".npmrc", ".yarnrc", ".yarnrc.yml", ".yarn"].forEach((rcFile) => {
+             const rcPath = path_1.join(appPath, rcFile);
+             if (fs_extra_1.existsSync(rcPath)) {
+                 fs_extra_1.copySync(rcPath, path_1.join(tmpRepo.name, rcFile), { dereference: true });
+@@ -120,7 +120,7 @@ function makePatch({ packagePathSpecifier, appPath, packageManager, includePaths
+             try {
+                 // try first without ignoring scripts in case they are required
+                 // this works in 99.99% of cases
+-                spawnSafe_1.spawnSafeSync(`yarn`, ["install", "--ignore-engines"], {
++                spawnSafe_1.spawnSafeSync(`yarn`, ["install"], {
+                     cwd: tmpRepoNpmRoot,
+                     logStdErrOnError: false,
+                 });
+@@ -128,7 +128,7 @@ function makePatch({ packagePathSpecifier, appPath, packageManager, includePaths
+             catch (e) {
+                 // try again while ignoring scripts in case the script depends on
+                 // an implicit context which we haven't reproduced
+-                spawnSafe_1.spawnSafeSync(`yarn`, ["install", "--ignore-engines", "--ignore-scripts"], {
++                spawnSafe_1.spawnSafeSync(`yarn`, ["install", "--mode=skip-build"], {
+                     cwd: tmpRepoNpmRoot,
+                 });
+             }
diff --git a/patches/react-native+0.74.2.patch b/patches/react-native+0.74.2.patch
diff --git a/patches/react-native+0.76.5.patch b/patches/react-native+0.76.5.patch
@@ -0,0 +1,257 @@
+diff --git a/node_modules/react-native/Libraries/Lists/FlatList.js b/node_modules/react-native/Libraries/Lists/FlatList.js
+index 6075f68..d2e94db 100644
+--- a/node_modules/react-native/Libraries/Lists/FlatList.js
++++ b/node_modules/react-native/Libraries/Lists/FlatList.js
+@@ -424,6 +424,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
+
+   constructor(props: Props<ItemT>) {
+     super(props);
++    this.props = props;
+     this._checkProps(this.props);
+     if (this.props.viewabilityConfigCallbackPairs) {
+       this._virtualizedListPairs =
+diff --git a/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.h b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.h
+new file mode 100644
+index 0000000..8b3607f
+--- /dev/null
++++ b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.h
+@@ -0,0 +1,95 @@
++
++/*
++ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
++ *
++ * Do not edit this file as changes may cause incorrect behavior and will be lost
++ * once the code is regenerated.
++ *
++ * @generated by GenerateRCTThirdPartyFabricComponentsProviderH
++ */
++
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wreturn-type-c-linkage"
++
++#import <React/RCTComponentViewProtocol.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name);
++#if RCT_NEW_ARCH_ENABLED
++#ifndef RCT_DYNAMIC_FRAMEWORKS
++
++
++
++#if !TARGET_OS_OSX && !TARGET_OS_VISION
++Class<RCTComponentViewProtocol> AutoLayoutViewCls(void) __attribute__((used)); // 2
++Class<RCTComponentViewProtocol> CellContainerCls(void) __attribute__((used)); // 2
++#endif
++
++
++#if !TARGET_OS_VISION
++
++#endif
++
++
++Class<RCTComponentViewProtocol> RNCSafeAreaProviderCls(void) __attribute__((used)); // 6
++Class<RCTComponentViewProtocol> RNCSafeAreaViewCls(void) __attribute__((used)); // 6
++#if !TARGET_OS_OSX
++Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSModalScreenCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenContainerCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenContentWrapperCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenFooterCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenNavigationContainerCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenStackHeaderConfigCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenStackHeaderSubviewCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSScreenStackCls(void) __attribute__((used)); // 7
++Class<RCTComponentViewProtocol> RNSSearchBarCls(void) __attribute__((used)); // 7
++#endif
++
++#if !TARGET_OS_OSX && !TARGET_OS_TV && !TARGET_OS_VISION
++
++#endif
++
++Class<RCTComponentViewProtocol> RNSVGCircleCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGClipPathCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGDefsCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGEllipseCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFeBlendCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFeColorMatrixCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFeCompositeCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFeFloodCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFeGaussianBlurCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFeMergeCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFeOffsetCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGFilterCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGForeignObjectCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGGroupCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGImageCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGSvgViewCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGLinearGradientCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGLineCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGMarkerCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGMaskCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGPathCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGPatternCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGRadialGradientCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGRectCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGSymbolCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGTextCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGTextPathCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGTSpanCls(void) __attribute__((used)); // 9
++Class<RCTComponentViewProtocol> RNSVGUseCls(void) __attribute__((used)); // 9
++
++#endif
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#pragma GCC diagnostic pop
++
+diff --git a/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm
+new file mode 100644
+index 0000000..1efe754
+--- /dev/null
++++ b/node_modules/react-native/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm
+@@ -0,0 +1,138 @@
++
++/**
++ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
++ *
++ * Do not edit this file as changes may cause incorrect behavior and will be lost
++ * once the code is regenerated.
++ *
++ * @generated by GenerateRCTThirdPartyFabricComponentsProviderCpp
++ */
++
++// OSS-compatibility layer
++
++#import "RCTThirdPartyFabricComponentsProvider.h"
++
++#import <string>
++#import <unordered_map>
++
++Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name) {
++  static std::unordered_map<std::string, Class (*)(void)> sFabricComponentsClassMap = {
++    #if RCT_NEW_ARCH_ENABLED
++    #ifndef RCT_DYNAMIC_FRAMEWORKS
++
++
++#if !TARGET_OS_OSX && !TARGET_OS_VISION
++
++    {"AutoLayoutView", AutoLayoutViewCls}, // 2
++
++    {"CellContainer", CellContainerCls}, // 2
++#endif
++
++
++#if !TARGET_OS_VISION
++
++#endif
++
++
++
++    {"RNCSafeAreaProvider", RNCSafeAreaProviderCls}, // 6
++
++    {"RNCSafeAreaView", RNCSafeAreaViewCls}, // 6
++#if !TARGET_OS_OSX
++
++    {"RNSFullWindowOverlay", RNSFullWindowOverlayCls}, // 7
++
++    {"RNSModalScreen", RNSModalScreenCls}, // 7
++
++    {"RNSScreenContainer", RNSScreenContainerCls}, // 7
++
++    {"RNSScreenContentWrapper", RNSScreenContentWrapperCls}, // 7
++
++    {"RNSScreenFooter", RNSScreenFooterCls}, // 7
++
++    {"RNSScreen", RNSScreenCls}, // 7
++
++    {"RNSScreenNavigationContainer", RNSScreenNavigationContainerCls}, // 7
++
++    {"RNSScreenStackHeaderConfig", RNSScreenStackHeaderConfigCls}, // 7
++
++    {"RNSScreenStackHeaderSubview", RNSScreenStackHeaderSubviewCls}, // 7
++
++    {"RNSScreenStack", RNSScreenStackCls}, // 7
++
++    {"RNSSearchBar", RNSSearchBarCls}, // 7
++#endif
++
++#if !TARGET_OS_OSX && !TARGET_OS_TV && !TARGET_OS_VISION
++
++#endif
++
++
++    {"RNSVGCircle", RNSVGCircleCls}, // 9
++
++    {"RNSVGClipPath", RNSVGClipPathCls}, // 9
++
++    {"RNSVGDefs", RNSVGDefsCls}, // 9
++
++    {"RNSVGEllipse", RNSVGEllipseCls}, // 9
++
++    {"RNSVGFeBlend", RNSVGFeBlendCls}, // 9
++
++    {"RNSVGFeColorMatrix", RNSVGFeColorMatrixCls}, // 9
++
++    {"RNSVGFeComposite", RNSVGFeCompositeCls}, // 9
++
++    {"RNSVGFeFlood", RNSVGFeFloodCls}, // 9
++
++    {"RNSVGFeGaussianBlur", RNSVGFeGaussianBlurCls}, // 9
++
++    {"RNSVGFeMerge", RNSVGFeMergeCls}, // 9
++
++    {"RNSVGFeOffset", RNSVGFeOffsetCls}, // 9
++
++    {"RNSVGFilter", RNSVGFilterCls}, // 9
++
++    {"RNSVGForeignObject", RNSVGForeignObjectCls}, // 9
++
++    {"RNSVGGroup", RNSVGGroupCls}, // 9
++
++    {"RNSVGImage", RNSVGImageCls}, // 9
++
++    {"RNSVGSvgView", RNSVGSvgViewCls}, // 9
++
++    {"RNSVGLinearGradient", RNSVGLinearGradientCls}, // 9
++
++    {"RNSVGLine", RNSVGLineCls}, // 9
++
++    {"RNSVGMarker", RNSVGMarkerCls}, // 9
++
++    {"RNSVGMask", RNSVGMaskCls}, // 9
++
++    {"RNSVGPath", RNSVGPathCls}, // 9
++
++    {"RNSVGPattern", RNSVGPatternCls}, // 9
++
++    {"RNSVGRadialGradient", RNSVGRadialGradientCls}, // 9
++
++    {"RNSVGRect", RNSVGRectCls}, // 9
++
++    {"RNSVGSymbol", RNSVGSymbolCls}, // 9
++
++    {"RNSVGText", RNSVGTextCls}, // 9
++
++    {"RNSVGTextPath", RNSVGTextPathCls}, // 9
++
++    {"RNSVGTSpan", RNSVGTSpanCls}, // 9
++
++    {"RNSVGUse", RNSVGUseCls}, // 9
++    #endif
++    #endif
++  };
++
++  auto p = sFabricComponentsClassMap.find(name);
++  if (p != sFabricComponentsClassMap.end()) {
++    auto classFunc = p->second;
++    return classFunc();
++  }
++  return nil;
++}
diff --git a/patches/react-native-paper+5.12.5.patch b/patches/react-native-paper+5.12.5.patch
@@ -1,3 +1,32 @@
+diff --git a/node_modules/react-native-paper/lib/typescript/types.d.ts b/node_modules/react-native-paper/lib/typescript/types.d.ts
+index cc0320a..e6e6488 100644
+--- a/node_modules/react-native-paper/lib/typescript/types.d.ts
++++ b/node_modules/react-native-paper/lib/typescript/types.d.ts
+@@ -1,5 +1,6 @@
+ import type * as React from 'react';
+ import type { $DeepPartial } from '@callstack/react-theme-provider';
++import type { Theme as NativeNavigationTheme } from '@react-navigation/native';
+ export declare type Font = {
+     fontFamily: string;
+     fontWeight?: 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
+@@ -161,16 +162,6 @@ export declare type MD3ElevationColors = {
+ export declare type $Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+ export declare type $RemoveChildren<T extends React.ComponentType<any>> = $Omit<React.ComponentPropsWithoutRef<T>, 'children'>;
+ export declare type EllipsizeProp = 'head' | 'middle' | 'tail' | 'clip';
+-export declare type NavigationTheme = {
+-    dark: boolean;
+-    colors: {
+-        primary: string;
+-        background: string;
+-        card: string;
+-        text: string;
+-        border: string;
+-        notification: string;
+-    };
+-};
++export declare type NavigationTheme = NativeNavigationTheme;
+ export {};
+ //# sourceMappingURL=types.d.ts.map
 diff --git a/node_modules/react-native-paper/src/components/BottomNavigation/BottomNavigationBar.tsx b/node_modules/react-native-paper/src/components/BottomNavigation/BottomNavigationBar.tsx
 index 0bfe303..a59ae06 100644
 --- a/node_modules/react-native-paper/src/components/BottomNavigation/BottomNavigationBar.tsx
@@ -11,3 +40,23 @@ index 0bfe303..a59ae06 100644
    getLabelText = ({ route }: { route: Route }) => route.title,
    getBadge = ({ route }: { route: Route }) => route.badge,
    getColor = ({ route }: { route: Route }) => route.color,
+diff --git a/node_modules/react-native-paper/src/types.tsx b/node_modules/react-native-paper/src/types.tsx
+index 175131c..c7961b8 100644
+--- a/node_modules/react-native-paper/src/types.tsx
++++ b/node_modules/react-native-paper/src/types.tsx
+@@ -203,14 +203,4 @@ export type $RemoveChildren<T extends React.ComponentType<any>> = $Omit<
+
+ export type EllipsizeProp = 'head' | 'middle' | 'tail' | 'clip';
+
+-export type NavigationTheme = {
+-  dark: boolean;
+-  colors: {
+-    primary: string;
+-    background: string;
+-    card: string;
+-    text: string;
+-    border: string;
+-    notification: string;
+-  };
+-};
++export type { Theme as NavigationTheme } from '@react-navigation/native';
diff --git a/src/components/modals/ChangeLanguageModal.tsx b/src/components/modals/ChangeLanguageModal.tsx
@@ -26,7 +26,6 @@ import { colors, weblateUrl } from '@/constants';
 import { useAppDispatch } from '@/store';
 import type { SupportedLanguage } from '@/translations';
 import { supportedLanguages } from '@/translations';
-import Toast from 'react-native-toast-message';
 
 const log = rootLogging.extend('ChangeLanguageModal');
 

diff --git a/src/views/navigation/screens/InformationGroup/LicensesScreen.tsx b/src/views/navigation/screens/InformationGroup/LicensesScreen.tsx
@@ -15,9 +15,6 @@ import { StyledView } from '@/style';
 import type { PropsWithNavigation } from '@/views/navigation/NavigationStack';
 
 import licenses from '@root/licenses.json';
-import Toast from 'react-native-toast-message';
-
-const log = rootLogging.extend('LicensesScreen');
 
 const log = rootLogging.extend('LicensesScreen');
 

diff --git a/src/views/navigation/screens/InformationGroup/SystemInformationScreen.tsx b/src/views/navigation/screens/InformationGroup/SystemInformationScreen.tsx
@@ -28,9 +28,6 @@ import { colors, spacing } from '@/constants';
 import { useAppDispatch, useAppSelector } from '@/store';
 import { StyledView } from '@/style';
 import type { PropsWithNavigation } from '@/views/navigation/NavigationStack';
-import Toast from 'react-native-toast-message';
-
-const log = rootLogging.extend('SystemInformationScreen');
 
 const log = rootLogging.extend('SystemInformationScreen');