fix merge issues

Author: CD-Z

App.tsx

@@ -20,6 +20,13 @@ import Main from './src/navigators/Main';
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
 import { Providers } from './src/providers/Providers';
 
+declare global {
+  interface ObjectConstructor {
+    typedKeys<T>(obj: T): Array<keyof T>;
+  }
+}
+Object.typedKeys = Object.keys as any;
+
 Notifications.setNotificationHandler({
   handleNotification: async () => {
     return {
@@ -34,7 +41,8 @@ createTables();
 LottieSplashScreen.hide();
 
 const App = () => {
-  const navigationRef = useRef<NavigationContainerRef<RootStackParamList>>(null);
+  const navigationRef =
+    useRef<NavigationContainerRef<RootStackParamList>>(null);
 
   return (
     <GestureHandlerRootView style={styles.flex}>

package.json

@@ -8,7 +8,7 @@
     "prestart": "node scripts/setEnvFile.cjs Debug",
     "start": "rock start",
     "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
-    "type-check": "tsc --noEmit",
+    "type-check": "tsc --noEmit --skipLibCheck",
     "prettier": "prettier --write \"./src/**/*.{js,jsx,ts,tsx}\" ./scripts",
     "buildRelease": "node scripts/setEnvFile.cjs Release && rock build:android --variant release --local",
     "open": "open ./android/app/build/outputs/apk/release/",
@@ -47,8 +47,7 @@
     "@react-navigation/bottom-tabs": "^7.4.7",
     "@react-navigation/native": "^7.1.17",
     "@react-navigation/native-stack": "^7.3.26",
-    "@react-navigation/stack": "^7.4.8",
-    "@shopify/flash-list": "2.0.2",
+    "@shopify/flash-list": "^2.0.3",
     "cheerio": "1.0.0-rc.12",
     "color": "^5.0.0",
     "dayjs": "^1.11.18",
@@ -81,6 +80,7 @@
     "react-native-file-access": "^3.2.0",
     "react-native-gesture-handler": "^2.28.0",
     "react-native-lottie-splash-screen": "^1.1.2",
+    "react-native-mmkv": "^3.3.3",
     "react-native-pager-view": "^6.9.1",
     "react-native-paper": "^5.14.5",
     "react-native-reanimated": "^4.1.0",
@@ -90,38 +90,42 @@
     "react-native-shimmer-placeholder": "^2.0.9",
     "react-native-tab-view": "^4.1.3",
     "react-native-url-polyfill": "^2.0.0",
-    "react-native-webview": "13.15.0",
+    "react-native-webview": "^13.16.0",
     "react-native-worklets": "^0.5.1",
     "react-native-zip-archive": "^7.0.2",
     "sanitize-html": "^2.17.0",
     "urlencode": "^2.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/preset-env": "^7.25.3",
-    "@babel/runtime": "^7.25.0",
-    "@react-native-community/cli": "^18.0.0",
-    "@react-native-community/cli-platform-android": "^18.0.0",
-    "@react-native-community/cli-platform-ios": "^18.0.0",
-    "@react-native/babel-preset": "^0.79.2",
-    "@react-native/eslint-config": "^0.79.2",
-    "@react-native/metro-config": "^0.79.2",
-    "@react-native/typescript-config": "^0.79.2",
-    "@types/color": "^3.0.3",
-    "@types/i18n-js": "^3.8.2",
-    "@types/lodash-es": "^4.17.6",
-    "@types/react": "19.1.3",
-    "@types/sanitize-html": "^2.11.0",
+    "@babel/core": "^7.28.4",
+    "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+    "@babel/preset-env": "^7.28.3",
+    "@babel/runtime": "^7.28.4",
+    "@react-native/babel-preset": "^0.81.1",
+    "@react-native/eslint-config": "^0.81.1",
+    "@react-native/metro-config": "^0.81.1",
+    "@react-native/typescript-config": "^0.81.1",
+    "@rock-js/platform-android": "^0.11.2",
+    "@rock-js/platform-ios": "^0.11.2",
+    "@rock-js/plugin-metro": "^0.11.2",
+    "@rozenite/metro": "1.0.0-alpha.14",
+    "@rozenite/mmkv-plugin": "1.0.0-alpha.14",
+    "@rozenite/network-activity-plugin": "1.0.0-alpha.14",
+    "@rozenite/performance-monitor-plugin": "1.0.0-alpha.14",
+    "@rozenite/react-navigation-plugin": "1.0.0-alpha.14",
+    "@types/color": "^4.2.0",
+    "@types/lodash-es": "^4.17.12",
+    "@types/react": "~19.1.12",
+    "@types/sanitize-html": "^2.16.0",
     "babel-plugin-module-resolver": "^5.0.2",
-    "babel-plugin-react-compiler": "19.1.0-rc.2",
-    "eslint": "^8.19.0",
+    "babel-plugin-react-compiler": "19.1.0-rc.3",
+    "eslint": "^8.57.1",
     "husky": "^7.0.4",
     "lint-staged": "^12.5.0",
     "prettier": "2.8.8",
     "react-native-dotenv": "^3.4.11",
-    "react-native-mmkv": "^3.3.1",
     "react-native-performance": "^5.1.4",
-    "rock": "^0.11.1",
+    "rock": "^0.11.2",
     "typescript": "~5.9.2"
   },
   "lint-staged": {
@@ -132,5 +136,8 @@
   },
   "engines": {
     "node": ">=20"
-  }
+  },
+  "trustedDependencies": [
+    "protobufjs"
+  ]
 }

pnpm-lock.yaml

@@ -10,7 +10,7 @@ import { useBackHandler } from '@hooks/index';
 import { BottomSheetModalMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
 import BottomSheetBackdrop from './BottomSheetBackdrop';
 import { useWindowDimensions } from 'react-native';
-import { useTheme } from '@hooks/persisted';
+import { useTheme } from '@providers/Providers';
 import { overlay } from 'react-native-paper';
 
 interface BottomSheetProps

src/components/BottomSheet/BottomSheet.tsx

@@ -7,10 +7,7 @@ import React, {
 } from 'react';
 
 // Import existing settings hook
-import {
-  useLibrarySettings,
-  LibrarySettings,
-} from '@hooks/persisted/useSettings';
+
 import { DBNovelInfo } from '@database/types';
 import {
   ExtendedCategory,
@@ -19,12 +16,13 @@ import {
 import { useLibraryNovels } from '@hooks/persisted/library/useLibraryNovels';
 import { useLibraryActions } from '@hooks/persisted/library/useLibraryActions';
 import ServiceManager, { QueuedBackgroundTask } from '@services/ServiceManager';
+import { SettingsContextType, useSettingsContext } from './SettingsContext';
 
 type LibraryContextType = {
   library: DBNovelInfo[];
   categories: ExtendedCategory[];
   isLoading: boolean;
-  settings: LibrarySettings;
+  settings: SettingsContextType;
   searchText: string;
   setSearchText: React.Dispatch<React.SetStateAction<string>>;
   refetchLibrary: () => void;
@@ -43,7 +41,7 @@ interface LibraryContextProviderProps {
 export function LibraryContextProvider({
   children,
 }: LibraryContextProviderProps) {
-  const settings = useLibrarySettings();
+  const settings = useSettingsContext();
 
   const { categories, categoriesLoading, refreshCategories, setCategories } =
     useFetchCategories();

src/components/Context/LibraryContext.tsx

@@ -3,7 +3,7 @@ import React, { createContext, useContext } from 'react';
 import { useSettings } from '@hooks/persisted/useSettings';
 import { defaultSettings } from '@screens/settings/constants/defaultValues';
 
-type SettingsContextType = ReturnType<typeof useSettings>;
+export type SettingsContextType = ReturnType<typeof useSettings>;
 
 const defaultValue = defaultSettings as any as SettingsContextType;
 const SettingsContext = createContext<SettingsContextType>(defaultValue);

src/components/Context/SettingsContext.tsx

@@ -3,7 +3,7 @@ import { Modal, ModalProps, overlay, Portal } from 'react-native-paper';
 import { StyleSheet, Text, View } from 'react-native';
 import Button from '@components/Button/Button';
 import { ThemeColors } from '@theme/types';
-import { useTheme } from '@hooks/persisted';
+import { useTheme } from '@providers/Providers';
 import { getString } from '@strings/translations';
 import Animated, {
   measure,

src/components/Modal/KeyboardAvoidingModal.tsx

@@ -12,6 +12,7 @@ import { LinearGradient } from 'expo-linear-gradient';
 import ListView from './ListView';
 
 import { useDeviceOrientation } from '@hooks';
+import { useSettingsContext } from './Context/SettingsContext';
 import { coverPlaceholderColor } from '../theme/colors';
 import { DisplayModes } from '@screens/library/constants/constants';
 import { DBNovelInfo, NovelInfo } from '@database/types';
@@ -22,7 +23,6 @@ import { getString } from '@strings/translations';
 import SourceScreenSkeletonLoading from '@screens/browse/loadingAnimation/SourceScreenSkeletonLoading';
 import { defaultCover } from '@plugins/helpers/constants';
 import { ActivityIndicator } from 'react-native-paper';
-import { useSettingsContext } from './Context/SettingsContext';
 
 interface UnreadBadgeProps {
   chaptersDownloaded: number;
@@ -94,7 +94,7 @@ function NovelCover<
   const orientation = useDeviceOrientation();
 
   const numColumns = useMemo(
-    () => (orientation === 'landscape' ? 6 : novelsPerRow),
+    () => (orientation === 'landscape' ? 6 : novelsPerRow ?? 3),
     [orientation, novelsPerRow],
   );
 
@@ -159,15 +159,15 @@ function NovelCover<
           {libraryStatus ? <InLibraryBadge theme={theme} /> : null}
           {isFromDB(item) ? (
             <>
-              {showDownloadBadges && item.chaptersDownloaded > 0 ? (
+              {showUnreadBadges && item.chaptersDownloaded > 0 ? (
                 <DownloadBadge
                   showUnreadBadges={showUnreadBadges}
                   chaptersDownloaded={item.chaptersDownloaded}
                   chaptersUnread={item.chaptersUnread}
                   theme={theme}
                 />
               ) : null}
-              {showUnreadBadges && item.chaptersUnread > 0 ? (
+              {showDownloadBadges && item.chaptersUnread > 0 ? (
                 <UnreadBadge
                   theme={theme}
                   chaptersDownloaded={item.chaptersDownloaded}
@@ -208,7 +208,7 @@ function NovelCover<
     <ListView
       item={item}
       downloadBadge={
-        showDownloadBadges && isFromDB(item) && item.chaptersDownloaded ? (
+        showUnreadBadges && isFromDB(item) && item.chaptersDownloaded ? (
           <DownloadBadge
             theme={theme}
             showUnreadBadges={showUnreadBadges}
@@ -218,7 +218,7 @@ function NovelCover<
         ) : null
       }
       unreadBadge={
-        showUnreadBadges && isFromDB(item) && item.chaptersUnread ? (
+        showDownloadBadges && isFromDB(item) && item.chaptersUnread ? (
           <UnreadBadge
             theme={theme}
             chaptersDownloaded={item.chaptersDownloaded}

src/components/NovelCover.tsx

@@ -1,4 +1,4 @@
-import { useAppSettings } from '@hooks/persisted';
+import { useSettingsContext } from '../Context/SettingsContext';
 import { useTheme } from '@providers/Providers';
 import * as React from 'react';
 import { StyleProp, ViewStyle, StyleSheet, View } from 'react-native';
@@ -16,7 +16,7 @@ const duration = 1000;
 
 function useSetupLoadingAnimations() {
   const sv = useSharedValue(0);
-  const { disableLoadingAnimations } = useAppSettings();
+  const { disableLoadingAnimations } = useSettingsContext();
   const theme = useTheme();
   const [highlightColor, backgroundColor] = useLoadingColors(theme);
 
@@ -160,7 +160,7 @@ function NovelMetaSkeleton() {
 
 const ChapterListSkeleton = ({ img }: { img?: boolean }) => {
   const sv = useSharedValue(0);
-  const { disableLoadingAnimations } = useAppSettings();
+  const { disableLoadingAnimations } = useSettingsContext();
 
   React.useEffect(() => {
     if (disableLoadingAnimations) return;

src/components/Skeleton/Skeleton.tsx

@@ -5,7 +5,7 @@ import {
   TextInputProps as RNTextInputProps,
 } from 'react-native';
 
-import { useTheme } from '@hooks/persisted';
+import { useTheme } from '@providers/Providers';
 
 interface TextInputProps extends RNTextInputProps {
   error?: boolean;