[pull] master from lnreader:master

.github/workflows/build.yml

@@ -1,4 +1,5 @@
 name: Build
+
 on:
   push:
     branches:
@@ -14,6 +15,7 @@ jobs:
     name: Build App
     runs-on: ubuntu-latest
     timeout-minutes: 60
+
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -23,7 +25,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -41,54 +43,24 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-read-only: false
-
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Create Environment File
-        run: |
-          cat > .env << EOF
-          MYANIMELIST_CLIENT_ID=${{ vars.MYANIMELIST_CLIENT_ID }}
-          ANILIST_CLIENT_ID=${{ vars.ANILIST_CLIENT_ID }}
-          GIT_HASH=$(git rev-parse --short HEAD)
-          RELEASE_DATE=$(date --utc +'%d/%m/%y %I:%M %p %Z')
-          BUILD_TYPE=Github Action
-          EOF
-
-      - name: Make Gradlew Executable
-        run: cd android && chmod +x ./gradlew
-
-      - name: Set Environment Variables
-        run: |
-          set -x
-          echo "COMMIT_COUNT=$(git rev-list --count HEAD)" >> $GITHUB_ENV
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
-      - name: Build Android Release
-        env:
-          COMMIT_COUNT: ${{ env.COMMIT_COUNT }}
-          COMMIT_ID: ${{ env.COMMIT_ID }}
+      - name: Generate Environment Variables
         run: |
-          sed -i 's/lnreader/lnreader-r${{ env.COMMIT_COUNT }}(${{ env.COMMIT_ID }})/g' android/app/src/main/res/values/strings.xml
-          cd android && ./gradlew assembleRelease -PcustomAppId=com.rajarsheechatterjee.LNReader.commit_${{ env.COMMIT_ID }} --build-cache
-          mv app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/LNReader-r${{ env.COMMIT_COUNT }}-${{ env.COMMIT_ID }}.apk
+          pnpm generate:env:release \
+            --build-type "Github Action" \
+            --node-env "production" \
+            --myanimelist-client-id "${{ vars.MYANIMELIST_CLIENT_ID }}" \
+            --anilist-client-id "${{ vars.ANILIST_CLIENT_ID }}"
 
-      - name: Upload Release Artifact
+      - name: Build Android Release with Rock
+        uses: callstackincubator/android@v3
         env:
-          COMMIT_COUNT: ${{ env.COMMIT_COUNT }}
-          COMMIT_ID: ${{ env.COMMIT_ID }}
-        uses: actions/upload-artifact@v4
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO_OWNER: ${{ github.repository_owner }}
+          REPO_NAME: ${{ github.event.repository.name }}
         with:
-          name: LNReader-r${{ env.COMMIT_COUNT }}-${{ env.COMMIT_ID }}
-          path: android/app/build/outputs/apk/release/LNReader-r${{ env.COMMIT_COUNT }}-${{ env.COMMIT_ID }}.apk
-          retention-days: 30
+          re-sign: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          variant: preRelease

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4

.github/workflows/testing.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
@@ -44,5 +44,8 @@ jobs:
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
 
+      - name: Generate Environment Variables
+        run: pnpm generate:env:debug
+
       - name: Run Tests
         run: pnpm run test

.github/workflows/types.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4

.gitignore

@@ -8,7 +8,7 @@ npm-debug.*
 *.mobileprovision
 *.orig.*
 web-build/
-.env
+.*env
 reader_playground/index.html
 # macOS
 .DS_Store
@@ -89,8 +89,16 @@ flake.lock
 # pnpm
 .pnpm-store
 
+src/generated/**/*
+
 .cursor/
 .agents/
 .claude/
 .jj/
 .sisyphus/
+
+# Rock
+.rock/
+
+# TypeScript
+*.tsbuildinfo

App.tsx

@@ -18,6 +18,7 @@ import AppErrorBoundary, {
 import Main from './src/navigators/Main';
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
 import { useInitDatabase } from '@database/db';
+import { ThemeProvider } from '@hooks/persisted/useTheme';
 
 Notifications.setNotificationHandler({
   handleNotification: async () => {
@@ -30,7 +31,6 @@ Notifications.setNotificationHandler({
   },
 });
 
-
 const App = () => {
   const state = useInitDatabase();
 
@@ -44,17 +44,23 @@ const App = () => {
     return <ErrorFallback error={state.error} resetError={() => null} />;
   }
 
+  if (!state.success) {
+    return null;
+  }
+
   return (
     <Suspense fallback={null}>
       <GestureHandlerRootView style={styles.flex}>
         <AppErrorBoundary>
           <SafeAreaProvider>
-            <PaperProvider>
-              <BottomSheetModalProvider>
-                <StatusBar translucent={true} backgroundColor="transparent" />
-                <Main />
-              </BottomSheetModalProvider>
-            </PaperProvider>
+            <ThemeProvider>
+              <PaperProvider>
+                <BottomSheetModalProvider>
+                  <StatusBar translucent={true} backgroundColor="transparent" />
+                  <Main />
+                </BottomSheetModalProvider>
+              </PaperProvider>
+            </ThemeProvider>
           </SafeAreaProvider>
         </AppErrorBoundary>
       </GestureHandlerRootView>

__mocks__/database.js

@@ -1,4 +1,5 @@
 jest.mock('@database/queries/NovelQueries', () => ({
+  getNovelById: jest.fn(),
   getNovelByPath: jest.fn(),
   deleteCachedNovels: jest.fn(),
   getCachedNovels: jest.fn(),
@@ -30,9 +31,13 @@ jest.mock('@database/queries/ChapterQueries', () => ({
   insertChapters: jest.fn(),
   getCustomPages: jest.fn(),
   getChapterCount: jest.fn(),
+  getChapterCountSync: jest.fn(),
   getPageChaptersBatched: jest.fn(),
+  getNovelChaptersSync: jest.fn(),
   getFirstUnreadChapter: jest.fn(),
   updateChapterProgress: jest.fn(),
+  getNovelScanlators: jest.fn(() => []),
+  getNovelScanlatorsSync: jest.fn(() => []),
 }));
 
 jest.mock('@database/queries/HistoryQueries', () => ({

__tests-modules__/test-utils.tsx

@@ -4,6 +4,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { Provider as PaperProvider } from 'react-native-paper';
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
+import { ThemeProvider } from '@hooks/persisted/useTheme';
 
 import AppErrorBoundary from '@components/AppErrorBoundary/AppErrorBoundary';
 import { NovelContextProvider } from '@screens/novel/NovelContext';
@@ -13,11 +14,13 @@ const AllTheProviders = ({ children }: { children: React.ReactElement }) => {
   return (
     <GestureHandlerRootView>
       <SafeAreaProvider>
-        <PaperProvider>
-          <BottomSheetModalProvider>
-            <AppErrorBoundary>{children}</AppErrorBoundary>
-          </BottomSheetModalProvider>
-        </PaperProvider>
+        <ThemeProvider>
+          <PaperProvider>
+            <BottomSheetModalProvider>
+              <AppErrorBoundary>{children}</AppErrorBoundary>
+            </BottomSheetModalProvider>
+          </PaperProvider>
+        </ThemeProvider>
       </SafeAreaProvider>
     </GestureHandlerRootView>
   );

android/app/build.gradle

@@ -15,7 +15,7 @@ react {
     //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
     // codegenDir = file("../../node_modules/@react-native/codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
-    // cliFile = file("../../node_modules/react-native/cli.js")
+    cliFile = file("../../node_modules/rock/dist/src/bin.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -84,7 +84,7 @@ android {
     compileSdk rootProject.ext.compileSdkVersion
     namespace "com.rajarsheechatterjee.LNReader"
     defaultConfig {
-        applicationId project.hasProperty('customAppId') ? project.getProperty('customAppId') : 'com.rajarsheechatterjee.LNReader'
+        applicationId 'com.rajarsheechatterjee.LNReader'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         // Generated version code. Supports versions up to 1024.1024.2048
@@ -105,6 +105,17 @@ android {
             applicationIdSuffix 'debug'
             versionNameSuffix '-debug'
         }
+        preRelease {
+            initWith release
+            matchingFallbacks = ["release"]
+            // Caution! In production, you need to generate your own keystore file.
+            // see https://reactnative.dev/docs/signed-apk-android.
+            applicationIdSuffix 'preRelease'
+            versionNameSuffix '-pre-release'
+            signingConfig signingConfigs.debug
+            minifyEnabled enableProguardInReleaseBuilds
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+        }
         release {
             // Caution! In production, you need to generate your own keystore file.
             // see https://reactnative.dev/docs/signed-apk-android.
@@ -134,4 +145,4 @@ dependencies {
     } else {
         implementation jscFlavor
     }
-}
+}

android/app/src/main/assets/css/index.css

@@ -53,6 +53,10 @@ img {
   max-width: 100%;
 }
 
+div:has(> table):not(#LNReader-chapter) {
+  overflow: auto;
+}
+
 table {
   background-color: var(--theme-onPrimary);
   border-collapse: collapse;
@@ -83,8 +87,6 @@ td {
   margin-left: var(--readerSettings-padding);
   margin-right: var(--readerSettings-padding);
   border-radius: 50px;
-  border-width: 1;
-  color: var(--theme-onPrimary);
   background-color: var(--theme-primary);
   font-family: var(--readerSettings-fontFamily);
   font-size: 16px;
@@ -93,6 +95,7 @@ td {
 }
 
 .next-button {
+  color: var(--theme-onPrimary);
   min-height: 40px;
   text-overflow: ellipsis;
   overflow: hidden;
@@ -160,6 +163,21 @@ td {
   background-color: transparent;
 }
 
+mark.lnreader-search-match {
+  border-radius: 2px;
+  color: inherit;
+  background-color: color-mix(
+    in srgb,
+    var(--theme-tertiary) 55%,
+    transparent
+  );
+}
+
+mark.lnreader-search-match-active {
+  color: var(--theme-onPrimary);
+  background-color: var(--theme-primary);
+}
+
 #Image-Modal {
   position: fixed;
   left: 0;

android/app/src/main/assets/js/core.js

@@ -135,6 +135,7 @@ window.tts = new (function () {
     'BR',
     'STRONG',
     'A',
+    'MARK',
   ];
   this.prevElement = null;
   this.currentElement = reader.chapterElement;
@@ -167,6 +168,7 @@ window.tts = new (function () {
   this.normalizeText = text => {
     if (!text) return '';
     return text
+      .replace(/^["'“”‘’]+|["'“”‘’]+$/g, '')
       .replace(/\s+/g, ' ')
       .replace(/\s*([.,!?;:])\s*/g, '$1 ')
       .trim();
@@ -780,14 +782,19 @@ window.addEventListener('load', () => {
             `${
               /\/p>/.test(_)
                 ? _.replace(
-                    /<br>\s*<br>(?:(?=\s*<\/?p[> ])|(?<=<\/?p\b[^>]*><br>\s*<br>))\s*/g,
+                    /<br>\s*<br>(?:(?=\s*<\/?p[> ])|(?<=<\/?p(?:>| [^>]+>)<br>\s*<br>))\s*/g,
                     '',
                   )
                 : _
             }`,
         ) //if p found, delete all double br near p
-        .replace(/<br>(?:(?=\s*<\/?p[> ])|(?<=<\/?p>\s*<br>))\s*/g, '');
+        .replace(/<br>(?:(?=\s*<\/?p[> ])|(?<=<\/?p(?:>| [^>]+>)(?:<[^>]+>)*\s*<br>))\s*/g, '');
     }
     reader.chapterElement.innerHTML = html;
+    const searchQuery = window.readerSearch?.query;
+    const searchIndex = window.readerSearch?.index;
+    if (searchQuery) {
+      window.readerSearch.search(searchQuery, searchIndex);
+    }
   });
 })();