diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 73e536aa3b..0e1dc17629 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -7,23 +7,42 @@ body: attributes: value: | Thanks for taking the time to fill out this bug report! + + - type: dropdown + id: platform + attributes: + label: Platform + description: On which platforms does this bug occur? + multiple: true + options: + - Desktop - macOS + - Desktop - Windows + - Desktop - Linux + - Desktop - Web + - Mobile - iOS + - Mobile - Android + - Mobile - Web + validations: + required: true + - type: textarea id: bug-description attributes: label: Describe the bug description: A clear and concise description of what the bug is. If you intend to submit a PR for this issue, tell us in the description. Thanks! placeholder: Bug description - validations: required: true + - type: textarea - id: feed-info + id: relevant-information attributes: - label: Feed Info - description: Please provide your feed id, feed url, and any other information that can help us reproduce the issue. - placeholder: Feed ID, Feed URL, etc. + label: Relevant Information + description: Please provide your user id, feed id, feed url, or any other information that can help us reproduce the issue. + placeholder: User ID, Feed ID, Feed URL, etc. validations: - required: true + required: false + - type: textarea id: reproduction attributes: @@ -36,7 +55,7 @@ body: id: environment attributes: label: Environment - description: Please provide the environment in which you are using the application. You can find this information by going to Settings > About and clicking the copy button next to the version tag. + description: Please provide the environment in which you are using the application. You can find this information by going to Preferences > About and clicking the copy button next to the version tag. - type: checkboxes id: checkboxes @@ -50,6 +69,7 @@ body: required: true - label: This issue is valid required: true + - type: checkboxes id: contributions attributes: diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml new file mode 100644 index 0000000000..707546174e --- /dev/null +++ b/.github/advanced-issue-labeler.yml @@ -0,0 +1,9 @@ +policy: + - section: + - id: [platform] + block-list: ["None", "Other"] + label: + - name: "platform: desktop" + keys: ["Desktop - macOS", "Desktop - Windows", "Desktop - Linux", "Desktop - Web"] + - name: "platform: mobile" + keys: ["Mobile - iOS", "Mobile - Android", "Mobile - Web"] diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index b92751c8ff..891918c269 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -18,6 +18,8 @@ updates: versions: [">=19.0.0"] - dependency-name: "@types/react-dom" versions: [">=19.0.0"] + - dependency-name: "@shopify/flash-list" + versions: [">1.7.3"] # Stuck by tailwindcss 4 - dependency-name: tailwindcss @@ -36,6 +38,11 @@ updates: # It's using export map and metro doesn't support it well - dependency-name: unist-util-visit-parents versions: [">=6.0.0"] + # electron 35 + - dependency-name: electron + versions: [">=35.0.0"] + - dependency-name: react-native-sheet-transitions + versions: [">0.1.2"] open-pull-requests-limit: 100 groups: minor: @@ -46,6 +53,21 @@ updates: applies-to: version-updates update-types: - "patch" + pathed: + patterns: + - immer + - re-resizable + - hono + - electron-context-menu + - "@mozilla/readability" + - daisyui + - jsonpointer + - workbox-precaching + - "@pengx17/electron-forge-maker-appimage" + - devlop + - "@microflash/remark-callout-directives" + - react-native-track-player + - react-native-sheet-transitions - package-ecosystem: github-actions directory: / diff --git a/.github/workflows/build-eas-development.yml b/.github/workflows/build-eas-development.yml new file mode 100644 index 0000000000..526ce758ee --- /dev/null +++ b/.github/workflows/build-eas-development.yml @@ -0,0 +1,124 @@ +name: Build iOS IPA for development + +on: + push: + branches: [dev] + paths: + - "apps/mobile/web-app/**" + - "apps/mobile/native/**" + - "apps/mobile/package.json" + pull_request: + branches: [dev] + paths: + - "apps/mobile/web-app/**" + - "apps/mobile/native/**" + - "apps/mobile/package.json" + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + check-runner: + runs-on: ubuntu-latest + outputs: + runner-label: ${{ steps.set-runner.outputs.runner-label }} + + steps: + - name: Set runner + id: set-runner + run: | + runners=$(curl -s -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUNNER_GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/actions/runners") + available=$(echo "$runners" | jq '.runners[]? | select(.status == "online" and .busy == false and .labels[] .name == "self-hosted")') + if [ -n "$available" ]; then + echo "runner-label=self-hosted" >> $GITHUB_OUTPUT + else + echo "runner-label=macos-latest" >> $GITHUB_OUTPUT + fi + + build: + name: Build iOS IPA for device + if: ${{ contains(github.head_ref || github.ref, 'refs/heads/') }} + needs: check-runner + runs-on: ${{ needs.check-runner.outputs.runner-label }} + + steps: + - name: 📦 Checkout code + uses: actions/checkout@v4 + + - name: 📦 Setup pnpm + if: needs.check-runner.outputs.runner-label == 'macos-latest' + uses: pnpm/action-setup@v4 + + - name: 🏗 Setup Node.js + if: needs.check-runner.outputs.runner-label == 'macos-latest' + uses: actions/setup-node@v4 + with: + node-version: 22 + cache: "pnpm" + + - name: 📱 Setup EAS + uses: expo/expo-github-action@v8 + with: + eas-version: latest + token: ${{ secrets.EXPO_TOKEN }} + + - name: Install dependencies + run: pnpm install + + - name: 🔨 Build iOS IPA + run: | + cd apps/mobile + eas build --platform ios --profile development --non-interactive --local --output=./build.ipa + env: + CI: true + + # Optional: Upload artifact + - name: 📤 Upload IPA + uses: actions/upload-artifact@v4 + with: + name: app-ios + path: apps/mobile/build.ipa + retention-days: 90 + + build-simulator: + name: Build iOS IPA for simulator + if: ${{ contains(github.head_ref || github.ref, 'refs/heads/') }} + runs-on: macos-latest + + steps: + - name: 📦 Checkout code + uses: actions/checkout@v4 + + - name: 📦 Setup pnpm + uses: pnpm/action-setup@v4 + + - name: 🏗 Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + cache: "pnpm" + + - name: 📱 Setup EAS + uses: expo/expo-github-action@v8 + with: + eas-version: latest + token: ${{ secrets.EXPO_TOKEN }} + + - name: Install dependencies + run: pnpm install + + - name: 🔨 Build iOS IPA + run: | + cd apps/mobile + eas build --platform ios --profile ios-simulator --non-interactive --local --output=./build-simulator.ipa + env: + CI: true + + # Optional: Upload artifact + - name: 📤 Upload IPA + uses: actions/upload-artifact@v4 + with: + name: app-ios-simulator + path: apps/mobile/build-simulator.ipa + retention-days: 90 diff --git a/.github/workflows/build-eas.yml b/.github/workflows/build-eas.yml index 07e5cbc670..e9820a09bb 100644 --- a/.github/workflows/build-eas.yml +++ b/.github/workflows/build-eas.yml @@ -2,12 +2,12 @@ name: Build iOS IPA on: push: - branches: [dev, main] + branches: [dev] paths: - "apps/mobile/**" - "pnpm-lock.yaml" pull_request: - branches: [dev, main] + branches: [dev] paths: - "apps/mobile/**" - "pnpm-lock.yaml" @@ -21,20 +21,44 @@ on: - production description: "Build profile" +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: + check-runner: + runs-on: ubuntu-latest + outputs: + runner-label: ${{ steps.set-runner.outputs.runner-label }} + + steps: + - name: Set runner + id: set-runner + run: | + runners=$(curl -s -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUNNER_GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/actions/runners") + available=$(echo "$runners" | jq '.runners[]? | select(.status == "online" and .busy == false and .labels[] .name == "self-hosted")') + if [ -n "$available" ]; then + echo "runner-label=self-hosted" >> $GITHUB_OUTPUT + else + echo "runner-label=macos-latest" >> $GITHUB_OUTPUT + fi + build: name: Build iOS IPA - runs-on: macos-latest + if: ${{ contains(github.head_ref || github.ref, 'refs/heads/') }} + needs: check-runner + runs-on: ${{ needs.check-runner.outputs.runner-label }} steps: - name: 📦 Checkout code uses: actions/checkout@v4 - name: 📦 Setup pnpm + if: needs.check-runner.outputs.runner-label == 'macos-latest' uses: pnpm/action-setup@v4 - with: - run_install: true + - name: 🏗 Setup Node.js + if: needs.check-runner.outputs.runner-label == 'macos-latest' uses: actions/setup-node@v4 with: node-version: 22 @@ -46,6 +70,9 @@ jobs: eas-version: latest token: ${{ secrets.EXPO_TOKEN }} + - name: Install dependencies + run: pnpm install + - name: 🔨 Build iOS IPA run: | cd apps/mobile diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index d5b675f8c2..28f19a528f 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -42,4 +42,4 @@ jobs: run: pnpm install - name: Build web and SSR server run: | - npm exec turbo run Follow#build:web @follow/ssr#build + npm exec turbo run Folo#build:web @follow/ssr#build diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e410ae9d6..0ead034b6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,13 +126,13 @@ jobs: cd apps/desktop pnpm update:main-hash - name: Build - if: matrix.os != 'macos-latest' + if: runner.os != 'macOS' run: pnpm build:electron env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - name: Build (macOS) - if: matrix.os == 'macos-latest' && github.event.inputs.mas != 'true' + if: runner.os == 'macOS' && github.event.inputs.mas != 'true' env: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} @@ -146,7 +146,7 @@ jobs: command: pnpm build:macos - name: Build (Mac App Store) - if: matrix.os == 'macos-latest' && github.event.inputs.mas == 'true' + if: runner.os == 'macOS' && github.event.inputs.mas == 'true' env: OSX_SIGN_KEYCHAIN_PATH: ${{ runner.temp }}/app-signing.keychain-db OSX_SIGN_IDENTITY: ${{ secrets.OSX_SIGN_IDENTITY_MAS }} @@ -155,7 +155,7 @@ jobs: run: pnpm build:mas - name: Build Renderer - if: matrix.os == 'ubuntu-latest' + if: runner.os == 'Linux' run: pnpm build:render env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} @@ -174,13 +174,14 @@ jobs: apps/desktop/out/make/**/*.AppImage apps/desktop/out/make/**/*.yml apps/desktop/out/make/**/*.pkg + apps/desktop/out/make/**/*.appx apps/desktop/dist/manifest.yml apps/desktop/dist/*.tar.gz retention-days: 90 - name: Upload file (arm64.dmg) uses: actions/upload-artifact@v4 - if: matrix.os == 'macos-latest' + if: runner.os == 'macOS' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -191,7 +192,7 @@ jobs: - name: Upload file (pkg) uses: actions/upload-artifact@v4 - if: matrix.os == 'macos-latest' + if: runner.os == 'macOS' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -211,6 +212,7 @@ jobs: apps/desktop/out/make/**/*.exe apps/desktop/out/make/**/*.AppImage apps/desktop/out/make/**/*.yml + apps/desktop/out/make/**/*.appx apps/desktop/dist/manifest.yml apps/desktop/dist/*.tar.gz @@ -240,5 +242,6 @@ jobs: apps/desktop/out/make/**/*.exe apps/desktop/out/make/**/*.AppImage apps/desktop/out/make/**/*.yml + apps/desktop/out/make/**/*.appx apps/desktop/dist/manifest.yml apps/desktop/dist/*.tar.gz diff --git a/.github/workflows/issue-labeler.yml b/.github/workflows/issue-labeler.yml new file mode 100644 index 0000000000..a4f430f5ab --- /dev/null +++ b/.github/workflows/issue-labeler.yml @@ -0,0 +1,34 @@ +name: Issue labeler +on: + issues: + types: [opened] + +permissions: + contents: read + +jobs: + label-component: + runs-on: ubuntu-latest + + permissions: + # required for all workflows + issues: write + + # only required for workflows in private repositories + actions: read + contents: read + + steps: + - uses: actions/checkout@v4 + + - name: Parse issue form + uses: stefanbuck/github-issue-parser@v3 + id: issue-parser + with: + template-path: .github/ISSUE_TEMPLATE/bug_report.yml + + - name: Set labels based on platform field + uses: redhat-plumbers-in-action/advanced-issue-labeler@v3 + with: + issue-form: ${{ steps.issue-parser.outputs.jsonString }} + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e4f312b438..7c65fdfe27 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,9 +3,10 @@ on: push: branches: [main, dev] +# Do not use secrets or variables to allow for public access env: - VITE_WEB_URL: ${{ vars.VITE_WEB_URL }} - VITE_API_URL: ${{ vars.VITE_API_URL }} + VITE_WEB_URL: https://app.follow.is + VITE_API_URL: https://api.follow.is name: CI Format, Typecheck and Lint concurrency: diff --git a/.vscode/settings.json b/.vscode/settings.json index a107f48f3e..1f1be9ddb1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,10 @@ { + "editor.formatOnSave": true, + "editor.defaultFormatter": "esbenp.prettier-vscode", "[javascript][javascriptreact][typescript][typescriptreact][json][jsonc]": { - "editor.formatOnSave": true, "editor.codeActionsOnSave": { "source.fixAll.eslint": "explicit" - }, - "editor.defaultFormatter": "esbenp.prettier-vscode" + } }, "files.associations": { "*.css": "tailwindcss" @@ -76,5 +76,8 @@ "i18n-ally.namespace": true, "i18n-ally.pathMatcher": "{namespaces}/{locale}.json", "lldb.library": "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/LLDB", - "lldb.launch.expressions": "native" + "lldb.launch.expressions": "native", + "[swift]": { + "editor.defaultFormatter": "swiftlang.swift-vscode" + } } diff --git a/README.md b/README.md index 1d8e62d742..878630e9e8 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,54 @@
- + Logo -

Follow

+

Folo

- Discord - · - Twitter - · - Releases + +     + +
+
+ + + + + + +
+ + + + + +
+
+ + App Store + GitHub Trending

- RSSNext%2Ffollow | Trendshift - RSSNext%2Ffollow | Trendshift - RSSNext%2Ffollow | Trendshift

-![](https://github.com/RSSNext/assets/blob/main/poster.png?raw=true) - -As they say, your thoughts are what you read—and we’ve been consuming noisy feeds for too long! Follow organizes content into one timeline, keeping you updated on what matters, noise-free. Share lists, explore collections, and enjoy distraction-free browsing. +As they say, your thoughts are what you read—and we’ve been consuming noisy feeds for too long! Folo organizes content into one timeline, keeping you updated on what matters, noise-free. Share lists, explore collections, and enjoy distraction-free browsing. ## 👋🏻 Getting Started & Join Our Community -Whether for users or professional developers, Follow will be your open information playground. Please be aware that Follow is currently under active development, and feedback is welcome for any [issue](https://github.com/RSSNext/Follow/issues) encountered. +Whether for users or professional developers, Folo will be your open information playground. Please be aware that Folo is currently under active development, and feedback is welcome for any [issue](https://github.com/RSSNext/Folo/issues) encountered. Feel free to try it using the following methods: -| [![](https://img.shields.io/badge/Try%20Web%20App-Online-55b467?labelColor=black&logo=vercel&style=flat-square)](https://app.follow.is) | No installation necessary! Visit our web app to experience it firsthand. | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------- | -| [![](https://img.shields.io/github/v/release/RSSNext/Follow?color=369eff&labelColor=black&logo=github&style=flat-square&label=Releases)](https://github.com/RSSNext/Follow/releases/latest) [![](https://img.shields.io/github/downloads/RSSNext/Follow/total?color=369eff&labelColor=black&logo=github&style=flat-square&label=Downloads)](https://github.com/RSSNext/Follow/releases/latest) | Download and install the desktop client for a smoother experience and enhanced features. | +| Operating System | Source | +| :--------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Any | Browser | +| iOS | App Store | +| macOS | Microsoft Store App Store | +| Windows | Microsoft Store App Store | +| Linux | App Store | You can also install using the following methods maintained by our community: @@ -46,10 +64,12 @@ You can also install using the following methods maintained by our community: > > **Star Us**, You will receive all release notifications from GitHub without any delay \~ +![Image](https://github.com/user-attachments/assets/a08f9437-b24c-4388-8f01-2826e09eeaf2) + - Performance Stats of RSSNext/Follow - Last 28 days + Performance Stats of RSSNext/Folo - Last 28 days @@ -69,7 +89,7 @@ A smarter and more efficient browsing with AI-powered features like translation, ### Dynamic Content Support -Because we know content is more than just text. From articles to videos, images to audio — Follow gets it all covered. +Because we know content is more than just text. From articles to videos, images to audio — Folo gets it all covered. ![](https://github.com/user-attachments/assets/d1379fd6-8767-476e-b0dc-d61753715e26) @@ -81,56 +101,17 @@ Tip creators across instantly with $POWER, support content you love, and unlock ### More Than Just An App -This isn’t just another app. Follow is a community — introducing a new era of openness and community-driven experience. +This isn’t just another app. Folo is a community — introducing a new era of openness and community-driven experience. ![](https://github.com/user-attachments/assets/62004a04-eaea-4f5d-bfbf-4e68b6b90286) ## 🤝 Contributing -If you are eligible to use Follow, you are welcome to join the open source community to build together. - -Before you start, make sure you have enabled [Corepack](https://nodejs.org/api/corepack.html). Corepack makes sure you are using the correct version (`packageManager` field in `package.json`) for package manager when you run corresponding commands. - -```sh -corepack enable -``` - -Install dependencies. - -```sh -pnpm install -``` - -### Develop in the browser - -```sh -pnpm run dev -``` - -Then the browser opens `https://app.follow.is/__debug_proxy`，you can access the online API environment to development and debugging. - -### Develop in the electron - -You need to fill in the required environment variables first. - -```sh -cp .env.example .env -``` - -Then set `VITE_API_URL` to `https://api.follow.is` and run: - -```sh -pnpm run dev:electron -``` - -Since it is not very convenient to develop in Electron, the first way to develop and contribute is recommended at this stage. - -> [!TIP] -> If you can't log in to the app, copy the `__Secure-better-auth.session_token` in the cookie from your browser into the app. +You are welcome to join the open source community to build together, please check our [Contributing Guide](./CONTRIBUTING.md) for more details. ## 📝 License -Follow is licensed under the GNU General Public License version 3 with the addition of the following special exception: +Folo is licensed under the GNU General Public License version 3 with the addition of the following special exception: All content in the `icons/mgc` directory is copyrighted by https://mgc.mingcute.com/ and cannot be redistributed. diff --git a/apps/desktop/build/dev.pfx b/apps/desktop/build/dev.pfx new file mode 100644 index 0000000000..77c1360804 Binary files /dev/null and b/apps/desktop/build/dev.pfx differ diff --git a/apps/desktop/changelog/0.3.13.md b/apps/desktop/changelog/0.3.13.md new file mode 100644 index 0000000000..eabfafb6ab --- /dev/null +++ b/apps/desktop/changelog/0.3.13.md @@ -0,0 +1,12 @@ +# What's new in v0.3.13 + +## New Features + +- New Action Language setting +- Export entry content to a PDF file + +## Improvements + +## Bug Fixes + +- Unable to update subscription information in time diff --git a/apps/desktop/forge.config.cts b/apps/desktop/forge.config.cts index a91e0b1f74..2b2d048bb5 100644 --- a/apps/desktop/forge.config.cts +++ b/apps/desktop/forge.config.cts @@ -6,6 +6,7 @@ import { cp, readdir } from "node:fs/promises" import path, { resolve } from "node:path" import { FuseV1Options, FuseVersion } from "@electron/fuses" +import { MakerAppX } from "@electron-forge/maker-appx" import { MakerDMG } from "@electron-forge/maker-dmg" import { MakerPKG } from "@electron-forge/maker-pkg" import { MakerSquirrel } from "@electron-forge/maker-squirrel" @@ -17,9 +18,9 @@ import setLanguages from "electron-packager-languages" import yaml from "js-yaml" import { rimraf, rimrafSync } from "rimraf" -const platform = process.argv[process.argv.indexOf("--platform") + 1] +const platform = process.argv.find((arg) => arg.startsWith("--platform"))?.split("=")[1] -const artifactRegex = /.*\.(?:exe|dmg|AppImage|zip)$/ +const artifactRegex = /.*\.(?:exe|dmg|AppImage|zip|appx)$/ const platformNamesMap = { darwin: "macos", linux: "linux", @@ -99,7 +100,7 @@ const config: ForgeConfig = { extraResource: ["./resources/app-update.yml"], protocols: [ { - name: "Follow", + name: "Folo", schemes: ["follow"], }, ], @@ -130,7 +131,6 @@ const config: ForgeConfig = { keychain: process.env.OSX_SIGN_KEYCHAIN_PATH, identity: process.env.OSX_SIGN_IDENTITY, provisioningProfile: process.env.OSX_SIGN_PROVISIONING_PROFILE_PATH, - preAutoEntitlements: platform !== "mas", }, ...(process.env.APPLE_ID && process.env.APPLE_PASSWORD && @@ -177,7 +177,7 @@ const config: ForgeConfig = { ["darwin", "mas"], ), new MakerSquirrel({ - name: "Follow", + name: "Folo", setupIcon: "resources/icon.ico", iconUrl: "https://app.follow.is/favicon.ico", }), @@ -193,11 +193,21 @@ const config: ForgeConfig = { }), new MakerPKG( { - name: "Follow", + name: "Folo", keychain: process.env.KEYCHAIN_PATH, }, ["mas"], ), + new MakerAppX({ + publisher: "CN=7CBBEB6A-9B0E-4387-BAE3-576D0ACA279E", + packageDisplayName: "Folo - Follow everything in one place", + devCert: "build/dev.pfx", + assets: "static/appx", + // @ts-ignore + publisherDisplayName: "Natural Selection Labs", + identityName: "NaturalSelectionLabs.Follow-Yourfavoritesinoneinbo", + packageBackgroundColor: "#FF5C00", + }), ], plugins: [ // Fuses are used to enable/disable various Electron functionality diff --git a/apps/desktop/locales/app/ar-DZ.json b/apps/desktop/locales/app/ar-DZ.json index 0e9fc14c06..f97018a92e 100644 --- a/apps/desktop/locales/app/ar-DZ.json +++ b/apps/desktop/locales/app/ar-DZ.json @@ -15,6 +15,8 @@ "discover.rss_url": "رابط RSS", "discover.select_placeholder": "اختر", "entry_actions.copy_link": "نسخ الرابط", + "entry_actions.exported_notify": "تم تصدير المقال كملف PDF.", + "entry_actions.export_as_pdf": "تصدير كملف PDF", "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.", "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.", "entry_actions.failed_to_save_to_obsidian": "فشل في الحفظ إلى Obsidian.", diff --git a/apps/desktop/locales/app/ar-IQ.json b/apps/desktop/locales/app/ar-IQ.json index 607a076fd2..5765b22f9f 100644 --- a/apps/desktop/locales/app/ar-IQ.json +++ b/apps/desktop/locales/app/ar-IQ.json @@ -15,6 +15,8 @@ "discover.rss_url": "رابط RSS", "discover.select_placeholder": "اختر", "entry_actions.copy_link": "نسخ الرابط", + "entry_actions.exported_notify": "تم تصدير المقال كملف PDF.", + "entry_actions.export_as_pdf": "تصدير كملف PDF", "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.", "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.", "entry_actions.failed_to_save_to_obsidian": "فشل في الحفظ إلى Obsidian.", diff --git a/apps/desktop/locales/app/ar-KW.json b/apps/desktop/locales/app/ar-KW.json index f1b0b4d42a..e20e1000f4 100644 --- a/apps/desktop/locales/app/ar-KW.json +++ b/apps/desktop/locales/app/ar-KW.json @@ -15,6 +15,8 @@ "discover.rss_url": "رابط RSS", "discover.select_placeholder": "اختر", "entry_actions.copy_link": "نسخ الرابط", + "entry_actions.exported_notify": "تم تصدير المقال كملف PDF.", + "entry_actions.export_as_pdf": "تصدير كملف PDF", "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.", "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.", "entry_actions.failed_to_save_to_obsidian": "فشل في الحفظ إلى Obsidian", diff --git a/apps/desktop/locales/app/ar-MA.json b/apps/desktop/locales/app/ar-MA.json index ad7a5fe0d2..e3fcc656f9 100644 --- a/apps/desktop/locales/app/ar-MA.json +++ b/apps/desktop/locales/app/ar-MA.json @@ -15,6 +15,8 @@ "discover.rss_url": "رابط RSS", "discover.select_placeholder": "اختر", "entry_actions.copy_link": "نسخ الرابط", + "entry_actions.exported_notify": "تم تصدير المقال كملف PDF.", + "entry_actions.export_as_pdf": "تصدير كملف PDF", "entry_actions.failed_to_save_to_eagle": "فشل الحفظ إلى Eagle.", "entry_actions.failed_to_save_to_instapaper": "فشل الحفظ إلى Instapaper.", "entry_actions.failed_to_save_to_obsidian": "فشل الحفظ في Obsidian", diff --git a/apps/desktop/locales/app/ar-SA.json b/apps/desktop/locales/app/ar-SA.json index 3058725ee0..a6359d1c59 100644 --- a/apps/desktop/locales/app/ar-SA.json +++ b/apps/desktop/locales/app/ar-SA.json @@ -15,6 +15,8 @@ "discover.rss_url": "عنوان URL لخلاصة RSS", "discover.select_placeholder": "اختيار", "entry_actions.copy_link": "نسخ الرابط", + "entry_actions.exported_notify": "تم تصدير المقال كملف PDF.", + "entry_actions.export_as_pdf": "تصدير كملف PDF", "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.", "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.", "entry_actions.failed_to_save_to_readwise": "فشل في الحفظ إلى Readwise.", diff --git a/apps/desktop/locales/app/ar-TN.json b/apps/desktop/locales/app/ar-TN.json index de92231861..703d068f6c 100644 --- a/apps/desktop/locales/app/ar-TN.json +++ b/apps/desktop/locales/app/ar-TN.json @@ -15,6 +15,8 @@ "discover.rss_url": "رابط RSS", "discover.select_placeholder": "اختر", "entry_actions.copy_link": "نسخ الرابط", + "entry_actions.exported_notify": "تم تصدير المقال كملف PDF.", + "entry_actions.export_as_pdf": "تصدير كملف PDF", "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.", "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.", "entry_actions.failed_to_save_to_readwise": "فشل في الحفظ إلى Readwise.", diff --git a/apps/desktop/locales/app/de.json b/apps/desktop/locales/app/de.json index 84394d8a07..f27733a698 100644 --- a/apps/desktop/locales/app/de.json +++ b/apps/desktop/locales/app/de.json @@ -15,6 +15,8 @@ "discover.rss_url": "RSS-URL", "discover.select_placeholder": "Auswählen", "entry_actions.copy_link": "Link kopieren", + "entry_actions.exported_notify": "Artikel als PDF exportiert.", + "entry_actions.export_as_pdf": "Als PDF exportieren", "entry_actions.failed_to_save_to_eagle": "Speichern in Eagle fehlgeschlagen.", "entry_actions.failed_to_save_to_instapaper": "Speichern in Instapaper fehlgeschlagen.", "entry_actions.failed_to_save_to_obsidian": "Speichern in Obsidian fehlgeschlagen", diff --git a/apps/desktop/locales/app/en.json b/apps/desktop/locales/app/en.json index 02776f5d66..f4f567110f 100644 --- a/apps/desktop/locales/app/en.json +++ b/apps/desktop/locales/app/en.json @@ -1,16 +1,16 @@ { "achievement.all_done": "All done!", "achievement.alpha_tester": "Alpha Tester", - "achievement.alpha_tester_description": "You are an alpha tester of Follow", + "achievement.alpha_tester_description": "You are an alpha tester of Folo", "achievement.description": "Be a hardcore player and mint NFTs.", "achievement.feed_booster": "Feed Booster", - "achievement.feed_booster_description": "You boosted the feed on Follow", + "achievement.feed_booster_description": "You boosted the feed on Folo", "achievement.first_claim_feed": "Feed Owner", - "achievement.first_claim_feed_description": "You own your feed on Follow", + "achievement.first_claim_feed_description": "You own your feed on Folo", "achievement.first_create_list": "List Creator", - "achievement.first_create_list_description": "You created your first list on Follow", + "achievement.first_create_list_description": "You created your first list on Folo", "achievement.follow_special_feed": "Special Feed Follower", - "achievement.follow_special_feed_description": "You followed the special feed on Follow", + "achievement.follow_special_feed_description": "You followed the special feed on Folo", "achievement.list_subscribe_100": "100 List Subscriber", "achievement.list_subscribe_100_description": "100 subscribers subscribed to the list you created", "achievement.list_subscribe_50": "50 List Subscriber", @@ -19,7 +19,7 @@ "achievement.list_subscribe_50_description": "50 subscribers subscribed to the list you created", "achievement.nft_coming_soon": "You cannot mint NFTs at this time. Once we are ready, they will be automatically credited to your account.", "achievement.product_hunt_vote": "Product Hunt Upvoter", - "achievement.product_hunt_vote_description": "You supported Follow on Product Hunt", + "achievement.product_hunt_vote_description": "You supported Folo on Product Hunt", "activation.activate": "Activate", "activation.description": "During the public testing phase, you need an invitation code to use this feature.", "activation.title": "Invitation Code", @@ -108,6 +108,8 @@ "entry_actions.image_gallery": "Image Gallery", "entry_actions.copied_notify": "{{which}} copied to clipboard.", "entry_actions.copy_link": "Copy Link", + "entry_actions.exported_notify": "Exported article as PDF.", + "entry_actions.export_as_pdf": "Export as PDF", "entry_actions.copy_title": "Copy Title", "entry_actions.delete": "Delete", "entry_actions.deleted": "Deleted.", @@ -246,13 +248,16 @@ "mark_all_read_button.mark_all_as_read": "Mark all as read", "mark_all_read_button.mark_as_read": "Mark as read", "mark_all_read_button.undo": "Undo", + "new_user_guide.actions.next": "Next", + "new_user_guide.actions.back": "Back", + "new_user_guide.actions.finish": "Finish", "new_user_guide.intro.description": "This guide will help you get started with the app.", - "new_user_guide.intro.title": "Welcome to Follow!", + "new_user_guide.intro.title": "Welcome to Folo!", "new_user_guide.outro.description": "You have completed the guide. Enjoy your journey!", "new_user_guide.outro.title": "You're all set!", - "new_user_guide.step.activation.description": "Don't worry, you can continue to use Follow without an invitation code.", + "new_user_guide.step.activation.description": "Don't worry, you can continue to use Folo without an invitation code.", "new_user_guide.step.activation.title": "Activate your account", - "new_user_guide.step.automation.description": "- Follow leverages advanced AI to assist your operations.\n- Action rules allow you to automate various actions on sources that meet specific conditions.\n- Integrations allow you to save entries to other services.", + "new_user_guide.step.automation.description": "- Folo leverages advanced AI to assist your operations.\n- Action rules allow you to automate various actions on sources that meet specific conditions.\n- Integrations allow you to save entries to other services.", "new_user_guide.step.behavior.title": "Behavior", "new_user_guide.step.behavior.unread_question.content": "Select how you would like to mark as read.", "new_user_guide.step.behavior.unread_question.description": "Don't worry, you can also change it later in the preferences.", @@ -264,10 +269,10 @@ "new_user_guide.step.migrate.profile": "Setup your profile", "new_user_guide.step.migrate.title": "Migrate from OPML file", "new_user_guide.step.migrate.wallet": "Check your wallet", - "new_user_guide.step.power.description": "Follow uses blockchain technology as an incentive mechanism for active users and outstanding creators. Users can obtain more services and benefits by holding and using Power Token. Creators can obtain more rewards by providing high-quality content and services.", + "new_user_guide.step.power.description": "Folo uses blockchain technology as an incentive mechanism for active users and outstanding creators. Users can obtain more services and benefits by holding and using Power Token. Creators can obtain more rewards by providing high-quality content and services.", "new_user_guide.step.rsshub.info": "Everything is RSSible. Our [RSSHub](https://github.com/DIYgod/RSSHub) community, comprising over 1,000 developers, has spent six years adapting nearly a thousand websites to provide almost all the content you need. This includes platforms like X (Twitter), Instagram, PlayStation, Spotify, Telegram, YouTube, and more. You can also write your own scripts to adapt additional websites.", "new_user_guide.step.rsshub.title": "Subscribe from RSSHub", - "new_user_guide.step.shortcuts.description1": "Shortcut keys allow you to use Follow more conveniently and efficiently.", + "new_user_guide.step.shortcuts.description1": "Shortcut keys allow you to use Folo more conveniently and efficiently.", "new_user_guide.step.shortcuts.description2": "Press to quickly view all shortcut keys at any time.", "new_user_guide.step.shortcuts.title": "Shortcuts", "new_user_guide.step.start_question.content": "Have you used other RSS readers before?", @@ -275,7 +280,7 @@ "new_user_guide.step.start_question.option2": "No, this is my first time using an RSS reader.", "new_user_guide.step.start_question.title": "Question", "new_user_guide.step.trending.title": "Popular Feeds", - "new_user_guide.step.views.description": "Follow uses different views for various types of content to offer an experience equal to or better than the original platform", + "new_user_guide.step.views.description": "Folo uses different views for various types of content to offer an experience equal to or better than the original platform", "new_user_guide.step.views.title": "Views", "notify.unfollow_feed": " have been unfollowed.", "notify.unfollow_feed_many": "All selected feeds have been unfollowed.", diff --git a/apps/desktop/locales/app/es.json b/apps/desktop/locales/app/es.json index 686c086876..c299baf2a0 100644 --- a/apps/desktop/locales/app/es.json +++ b/apps/desktop/locales/app/es.json @@ -15,6 +15,8 @@ "discover.rss_url": "RSS URL", "discover.select_placeholder": "Seleccionar", "entry_actions.copy_link": "Copiar enlace", + "entry_actions.exported_notify": "Artículo exportado como PDF.", + "entry_actions.export_as_pdf": "Exportar como PDF", "entry_actions.failed_to_save_to_obsidian": "Error al guardar en Obsidian", "entry_actions.mark_as_read": "Marcar como leído", "entry_actions.mark_as_unread": "Marcar como no leído", diff --git a/apps/desktop/locales/app/fi.json b/apps/desktop/locales/app/fi.json index 9e4abfe478..baa90f1125 100644 --- a/apps/desktop/locales/app/fi.json +++ b/apps/desktop/locales/app/fi.json @@ -15,6 +15,8 @@ "discover.rss_url": "RSS-URL", "discover.select_placeholder": "Valitse", "entry_actions.copy_link": "Kopioi linkki", + "entry_actions.exported_notify": "Artikkeli vietiin PDF-muodossa.", + "entry_actions.export_as_pdf": "Vie PDF:nä", "entry_actions.failed_to_save_to_eagle": "Tallennus Eagleen epäonnistui.", "entry_actions.failed_to_save_to_instapaper": "Tallennus Instapaperiin epäonnistui.", "entry_actions.failed_to_save_to_readwise": "Tallennus Readwiseen epäonnistui.", diff --git a/apps/desktop/locales/app/fr.json b/apps/desktop/locales/app/fr.json index 81047be3dc..d973e5cad9 100644 --- a/apps/desktop/locales/app/fr.json +++ b/apps/desktop/locales/app/fr.json @@ -15,6 +15,8 @@ "discover.rss_url": "URL du RSS", "discover.select_placeholder": "Sélectionner", "entry_actions.copy_link": "Copier le lien", + "entry_actions.exported_notify": "Article exporté en PDF.", + "entry_actions.export_as_pdf": "Exporter en PDF", "entry_actions.failed_to_save_to_eagle": "Échec de l'enregistrement sur Eagle.", "entry_actions.failed_to_save_to_instapaper": "Échec de l'enregistrement sur Instapaper.", "entry_actions.failed_to_save_to_readwise": "Échec de l'enregistrement sur Readwise.", diff --git a/apps/desktop/locales/app/it.json b/apps/desktop/locales/app/it.json index 03e47a3915..a227a30f1f 100644 --- a/apps/desktop/locales/app/it.json +++ b/apps/desktop/locales/app/it.json @@ -15,6 +15,8 @@ "discover.rss_url": "URL RSS", "discover.select_placeholder": "Seleziona", "entry_actions.copy_link": "Copia link", + "entry_actions.exported_notify": "Articolo esportato come PDF.", + "entry_actions.export_as_pdf": "Esporta come PDF", "entry_actions.failed_to_save_to_eagle": "Salvataggio su Eagle non riuscito.", "entry_actions.failed_to_save_to_instapaper": "Salvataggio su Instapaper non riuscito.", "entry_actions.failed_to_save_to_readwise": "Salvataggio su Readwise non riuscito.", diff --git a/apps/desktop/locales/app/ja.json b/apps/desktop/locales/app/ja.json index 6e5a41074b..d1073451e5 100644 --- a/apps/desktop/locales/app/ja.json +++ b/apps/desktop/locales/app/ja.json @@ -1,16 +1,16 @@ { "achievement.all_done": "すべて完了！", "achievement.alpha_tester": "アルファ テスター", - "achievement.alpha_tester_description": "あなたは Follow のアルファ テスターです", + "achievement.alpha_tester_description": "あなたは Folo のアルファ テスターです", "achievement.description": "ハードコア プレイヤーになって NFT をミントしよう。", "achievement.feed_booster": "フィード ブースター", - "achievement.feed_booster_description": "Follow のフィードをブーストしました", + "achievement.feed_booster_description": "Folo のフィードをブーストしました", "achievement.first_claim_feed": "フィードの所有者", - "achievement.first_claim_feed_description": "あなたは Follow のフィード所有者です", + "achievement.first_claim_feed_description": "あなたは Folo のフィード所有者です", "achievement.first_create_list": "リスト作成者", - "achievement.first_create_list_description": "あなたは Follow のリスト作成者です", + "achievement.first_create_list_description": "あなたは Folo のリスト作成者です", "achievement.follow_special_feed": "スペシャル フィード フォロワーです", - "achievement.follow_special_feed_description": "あなたは Follow でスペシャルフィードをフォローしています", + "achievement.follow_special_feed_description": "あなたは Folo でスペシャルフィードをフォローしています", "achievement.list_subscribe_100": "100 リスト購読者", "achievement.list_subscribe_100_description": "あなたが作成したリストの購読者数が 100 人を超えました", "achievement.list_subscribe_50": "あなたが作成したリストの購読者数が 50 人を超えました", @@ -19,7 +19,7 @@ "achievement.list_subscribe_50_description": "あなたが作成したリストの購読者数が 50 人を超えました", "achievement.nft_coming_soon": "今は NFT をミントすることはできません。準備ができたらあなたのアカウントに自動でクレジットされます。", "achievement.product_hunt_vote": "Product Hunt 投票者", - "achievement.product_hunt_vote_description": "あなたは Product Hunt での Follow サポーターです", + "achievement.product_hunt_vote_description": "あなたは Product Hunt での Folo サポーターです", "activation.activate": "有効化", "activation.description": "パブリック ベータ テストフェーズ期間中、この機能を使用するには招待コードが必要です。", "activation.title": "招待コード", @@ -63,7 +63,7 @@ "discover.category.travel": "旅行", "discover.category.university": "大学", "discover.default_option": " (デフォルト)", - "discover.feed_description": "このフィードの説明は Follow で表示されます、またパラメータ フォームに関連する情報を記入することができます。", + "discover.feed_description": "このフィードの説明は Folo で表示されます、またパラメータ フォームに関連する情報を記入することができます。", "discover.feed_maintainers": "フィードは RSSHub が提供し とともにクレジットされます。", "discover.import.click_to_upload": "OPML ファイルをアップロードするにはクリック", "discover.import.conflictItems": "重複アイテム", @@ -107,6 +107,8 @@ "discover.target.lists": "リスト", "entry_actions.copied_notify": "{{which}} をクリップボードにコピーしました。", "entry_actions.copy_link": "リンクをコピー", + "entry_actions.exported_notify": "記事をPDFとしてエクスポートしました。", + "entry_actions.export_as_pdf": "PDFとしてエクスポート", "entry_actions.copy_title": "タイトルをコピー", "entry_actions.delete": "削除", "entry_actions.deleted": "削除済み", @@ -198,7 +200,7 @@ "feed_form.category": "カテゴリー", "feed_form.category_description": "デフォルトでは、フォローはウェブサイトごとにグループ化されます。", "feed_form.error_fetching_feed": "フィードの取得に失敗しました。", - "feed_form.fee": "Follow 手数料", + "feed_form.fee": "Folo 手数料", "feed_form.fee_description": "このリストをフォローするにはリスト作成者が設定した手数料が必要です。", "feed_form.feed_not_found": "フィードが見つかりません。", "feed_form.feedback": "フィードバック", @@ -245,12 +247,12 @@ "mark_all_read_button.mark_as_read": "を既読にする", "mark_all_read_button.undo": "元に戻す", "new_user_guide.intro.description": "このガイドはアプリを快適に始めるためのガイドです。", - "new_user_guide.intro.title": "Follow へようこそ！", - "new_user_guide.outro.description": "ガイドを完了しました。快適な Follow 体験を！", + "new_user_guide.intro.title": "Folo へようこそ！", + "new_user_guide.outro.description": "ガイドを完了しました。快適な Folo 体験を！", "new_user_guide.outro.title": "すべて完了しました！", - "new_user_guide.step.activation.description": "大丈夫です、 Follow を招待コードなしに続けることができます。", + "new_user_guide.step.activation.description": "大丈夫です、 Folo を招待コードなしに続けることができます。", "new_user_guide.step.activation.title": "アカウントを有効化", - "new_user_guide.step.automation.description": "- Follow は高度なAIを活用し、お客様の業務を支援します。\n - アクションルールにより、特定の条件を満たしたソースに対して様々なアクションを自動化できます。", + "new_user_guide.step.automation.description": "- Folo は高度なAIを活用し、お客様の業務を支援します。\n - アクションルールにより、特定の条件を満たしたソースに対して様々なアクションを自動化できます。", "new_user_guide.step.behavior.title": "振る舞い", "new_user_guide.step.behavior.unread_question.content": "既読時の振る舞いを選択してください", "new_user_guide.step.behavior.unread_question.description": "大丈夫です、設定であとから変更することもできます。", @@ -262,10 +264,10 @@ "new_user_guide.step.migrate.profile": "プロファイルをセットアップ", "new_user_guide.step.migrate.title": "OPML ファイルを構成する", "new_user_guide.step.migrate.wallet": "ウォレットをチェック", - "new_user_guide.step.power.description": "Follow はアクティブなユーザーや優れたクリエイターに対するインセンティブ メカニズムとしてブロックチェーン技術を利用しています。ユーザーは Power トークンを保有・利用することで、より多くのサービスや特典を得ることができます。クリエイターは、質の高いコンテンツやサービスを提供することで、より多くの報酬を得ることができます。", + "new_user_guide.step.power.description": "Folo はアクティブなユーザーや優れたクリエイターに対するインセンティブ メカニズムとしてブロックチェーン技術を利用しています。ユーザーは Power トークンを保有・利用することで、より多くのサービスや特典を得ることができます。クリエイターは、質の高いコンテンツやサービスを提供することで、より多くの報酬を得ることができます。", "new_user_guide.step.rsshub.info": "すべてを RSSible（RSS化） わたしたちの [RSSHub](https://github.com/DIYgod/RSSHub) コミュニティです。1,000人以上の開発者で構成され、6年間かけて約1,000のウェブサイトを適応させ、あなたが必要とするほぼすべてのコンテンツを提供してきました。これにはX（Twitter）、Instagram、PlayStation、Spotify、Telegram、YouTubeなどのプラットフォームが含まれます。また独自のスクリプトを記述して、追加のウェブサイトを適応させることもできます。", "new_user_guide.step.rsshub.title": "RSSHub を購読", - "new_user_guide.step.shortcuts.description1": "ショートカットキーを利用すると Follow をより便利に、より効率的に使えます。", + "new_user_guide.step.shortcuts.description1": "ショートカットキーを利用すると Folo をより便利に、より効率的に使えます。", "new_user_guide.step.shortcuts.description2": " を押すと素早くすべてのショートカットキーにアクセスできます。", "new_user_guide.step.shortcuts.title": "ショートカット", "new_user_guide.step.start_question.content": "他の RSS リーダーを使ったことはありますか？", @@ -273,7 +275,7 @@ "new_user_guide.step.start_question.option2": "いいえ、RSS リーダーを使うのは初めてです", "new_user_guide.step.start_question.title": "質問", "new_user_guide.step.trending.title": "人気のフィード", - "new_user_guide.step.views.description": "Follow は様々なタイプのコンテンツに異なる表示方法を使用し、オリジナルのプラットフォームと同等以上の体験を提供します。", + "new_user_guide.step.views.description": "Folo は様々なタイプのコンテンツに異なる表示方法を使用し、オリジナルのプラットフォームと同等以上の体験を提供します。", "new_user_guide.step.views.title": "表示", "notify.unfollow_feed": " のフォローを解除しました", "notify.unfollow_feed_many": "選択したすべてのフィードのフォローを解除しました。", diff --git a/apps/desktop/locales/app/ko.json b/apps/desktop/locales/app/ko.json index 034f25e702..c93b822727 100644 --- a/apps/desktop/locales/app/ko.json +++ b/apps/desktop/locales/app/ko.json @@ -1,16 +1,16 @@ { "achievement.all_done": "모두 완료되었습니다!", "achievement.alpha_tester": "알파 테스터", - "achievement.alpha_tester_description": "Follow 알파 테스터입니다", + "achievement.alpha_tester_description": "Folo 알파 테스터입니다", "achievement.description": "열렬한 플레이어가 되어 NFT를 발행하세요.", "achievement.feed_booster": "피드 부스터", - "achievement.feed_booster_description": "Follow에서 피드를 부스트했습니다", + "achievement.feed_booster_description": "Folo에서 피드를 부스트했습니다", "achievement.first_claim_feed": "피드 소유자", - "achievement.first_claim_feed_description": "Follow 에서 귀하의 피드를 소유하고 있습니다", + "achievement.first_claim_feed_description": "Folo 에서 귀하의 피드를 소유하고 있습니다", "achievement.first_create_list": "목록 생성자", - "achievement.first_create_list_description": "Follow에서 첫 번째 목록을 만들었습니다", + "achievement.first_create_list_description": "Folo에서 첫 번째 목록을 만들었습니다", "achievement.follow_special_feed": "특별 피드 팔로워", - "achievement.follow_special_feed_description": "Follow에서 특별 피드를 팔로우했습니다", + "achievement.follow_special_feed_description": "Folo에서 특별 피드를 팔로우했습니다", "achievement.list_subscribe_100": "100명 목록 구독자", "achievement.list_subscribe_100_description": "회원님이 만든 목록을 100명이 구독했습니다", "achievement.list_subscribe_50": "50명 목록 구독자", @@ -19,7 +19,7 @@ "achievement.list_subscribe_50_description": "50명의 구독자가 생성한 목록을 구독했습니다.", "achievement.nft_coming_soon": "현재 NFT를 발행할 수 없습니다. 준비가 되면 자동으로 계정에 적립됩니다.", "achievement.product_hunt_vote": "Product Hunt 추천인", - "achievement.product_hunt_vote_description": "Product Hunt에서 Follow를 지지했습니다", + "achievement.product_hunt_vote_description": "Product Hunt에서 Folo를 지지했습니다", "activation.activate": "활성화", "activation.description": "공개 테스트 단계에서는 이 기능을 사용하려면 초대 코드가 필요합니다.", "activation.title": "초대 코드", @@ -107,6 +107,8 @@ "discover.target.lists": "목록", "entry_actions.copied_notify": "{{which}}이(가) 클립보드에 복사되었습니다", "entry_actions.copy_link": "링크 복사", + "entry_actions.exported_notify": "PDF로 기사 내보내기 완료.", + "entry_actions.export_as_pdf": "PDF로 내보내기", "entry_actions.copy_title": "제목 복사", "entry_actions.delete": "삭제", "entry_actions.deleted": "삭제됨", @@ -245,12 +247,12 @@ "mark_all_read_button.mark_as_read": "을(를) 읽음으로 표시", "mark_all_read_button.undo": "실행 취소", "new_user_guide.intro.description": "이 가이드는 앱을 시작하는 데 도움이 될 것입니다.", - "new_user_guide.intro.title": "Follow에 오신 것을 환영합니다!", + "new_user_guide.intro.title": "Folo에 오신 것을 환영합니다!", "new_user_guide.outro.description": "가이드를 완료했습니다. 즐거운 여정 되세요!", "new_user_guide.outro.title": "모든 준비가 완료되었습니다!", - "new_user_guide.step.activation.description": "걱정하지 마세요, 초대 코드 없이도 Follow를 계속 사용할 수 있습니다.", + "new_user_guide.step.activation.description": "걱정하지 마세요, 초대 코드 없이도 Folo를 계속 사용할 수 있습니다.", "new_user_guide.step.activation.title": "계정 활성화", - "new_user_guide.step.automation.description": "- Follow는 고급 AI를 활용하여 작업을 지원합니다.\n- 액션 규칙을 통해 특정 조건을 충족하는 소스에 대해 다양한 작업을 자동화할 수 있습니다.\n- 통합을 통해 항목을 다른 서비스에 저장할 수 있습니다.", + "new_user_guide.step.automation.description": "- Folo는 고급 AI를 활용하여 작업을 지원합니다.\n- 액션 규칙을 통해 특정 조건을 충족하는 소스에 대해 다양한 작업을 자동화할 수 있습니다.\n- 통합을 통해 항목을 다른 서비스에 저장할 수 있습니다.", "new_user_guide.step.behavior.title": "동작", "new_user_guide.step.behavior.unread_question.content": "읽음 표시 방법을 선택하세요.", "new_user_guide.step.behavior.unread_question.description": "걱정하지 마세요, 나중에 환경설정에서 변경할 수 있습니다.", @@ -262,13 +264,13 @@ "new_user_guide.step.migrate.profile": "프로필 설정", "new_user_guide.step.migrate.title": "OPML 파일에서 마이그레이션", "new_user_guide.step.migrate.wallet": "지갑 확인", - "new_user_guide.step.power.description": "Follow는 활발한 사용자와 뛰어난 크리에이터를 위한 인센티브 메커니즘으로 블록체인 기술을 사용합니다. 사용자는 파워 토큰을 보유하고 사용함으로써 더 많은 서비스와 혜택을 얻을 수 있습니다. 크리에이터는 고품질 콘텐츠와 서비스를 제공함으로써 더 많은 보상을 얻을 수 있습니다.", + "new_user_guide.step.power.description": "Folo는 활발한 사용자와 뛰어난 크리에이터를 위한 인센티브 메커니즘으로 블록체인 기술을 사용합니다. 사용자는 파워 토큰을 보유하고 사용함으로써 더 많은 서비스와 혜택을 얻을 수 있습니다. 크리에이터는 고품질 콘텐츠와 서비스를 제공함으로써 더 많은 보상을 얻을 수 있습니다.", "new_user_guide.step.rsshub.info": "모든 것은 RSS가 가능합니다. 1,000명 이상의 개발자로 구성된 [RSSHub](https://github.com/DIYgod/RSSHub) 커뮤니티는 6년 동안 거의 모든 필요한 콘텐츠를 제공하기 위해 수천 개의 웹사이트를 적용해왔습니다. X(Twitter), Instagram, PlayStation, Spotify, Telegram, YouTube 등의 플랫폼이 포함됩니다. 추가 웹사이트를 적용하기 위해 자신만의 스크립트를 작성할 수도 있습니다.", "new_user_guide.step.rsshub.title": "RSSHub에서 구독", - "new_user_guide.step.shortcuts.description1": "단축키를 사용하면 Follow를 더 편리하고 효율적으로 사용할 수 있습니다.", + "new_user_guide.step.shortcuts.description1": "단축키를 사용하면 Folo를 더 편리하고 효율적으로 사용할 수 있습니다.", "new_user_guide.step.shortcuts.description2": "언제든지 를 눌러 모든 단축키를 빠르게 볼 수 있습니다.", "new_user_guide.step.shortcuts.title": "단축키", - "new_user_guide.step.views.description": "Follow는 다양한 유형의 콘텐츠에 대해 서로 다른 뷰를 사용하여 원본 플랫폼과 동등하거나 더 나은 경험을 제공합니다", + "new_user_guide.step.views.description": "Folo는 다양한 유형의 콘텐츠에 대해 서로 다른 뷰를 사용하여 원본 플랫폼과 동등하거나 더 나은 경험을 제공합니다", "new_user_guide.step.views.title": "뷰", "notify.unfollow_feed": "이(가) 언팔로우되었습니다.", "notify.unfollow_feed_many": "선택한 모든 피드가 언팔로우되었습니다.", diff --git a/apps/desktop/locales/app/pt.json b/apps/desktop/locales/app/pt.json index 1ad2fd9805..8cdd99d1cd 100644 --- a/apps/desktop/locales/app/pt.json +++ b/apps/desktop/locales/app/pt.json @@ -15,6 +15,8 @@ "discover.rss_url": "RSS URL", "discover.select_placeholder": "選択", "entry_actions.copy_link": "リンクをコピー", + "entry_actions.exported_notify": "Artigo exportado como PDF.", + "entry_actions.export_as_pdf": "Exportar como PDF", "entry_actions.failed_to_save_to_eagle": "Eagle への保存に失敗しました。", "entry_actions.failed_to_save_to_instapaper": "Instapaper への保存に失敗しました。", "entry_actions.failed_to_save_to_readwise": "Readwise への保存に失敗しました。", diff --git a/apps/desktop/locales/app/ru.json b/apps/desktop/locales/app/ru.json index 7a6b38ae39..8f8f8f6b4f 100644 --- a/apps/desktop/locales/app/ru.json +++ b/apps/desktop/locales/app/ru.json @@ -1,16 +1,16 @@ { "achievement.all_done": "Все сделано!", "achievement.alpha_tester": "Альфа-тестер", - "achievement.alpha_tester_description": "Вы альфа-тестер Follow", + "achievement.alpha_tester_description": "Вы альфа-тестер Folo", "achievement.description": "Будьте хардкорным игроком и минтить в NFT.", "achievement.feed_booster": "Усилитель канала", - "achievement.feed_booster_description": "Вы усилили канал в Follow", + "achievement.feed_booster_description": "Вы усилили канал в Folo", "achievement.first_claim_feed": "Владелец канала", - "achievement.first_claim_feed_description": "Вы владеете своим каналом в Follow", + "achievement.first_claim_feed_description": "Вы владеете своим каналом в Folo", "achievement.first_create_list": "Создатель списка", - "achievement.first_create_list_description": "Вы создали свой первый список в Follow", + "achievement.first_create_list_description": "Вы создали свой первый список в Folo", "achievement.follow_special_feed": "Подписчик специального канала", - "achievement.follow_special_feed_description": "Вы подписались на специальный канал в Follow", + "achievement.follow_special_feed_description": "Вы подписались на специальный канал в Folo", "achievement.list_subscribe_100": "100 подписчиков списка", "achievement.list_subscribe_100_description": "100 подписчиков подписались на созданный вами список", "achievement.list_subscribe_50": "50 подписчиков списка", @@ -19,7 +19,7 @@ "achievement.list_subscribe_50_description": "50 подписчиков подписались на созданный вами список", "achievement.nft_coming_soon": "Вы не можете минтить NFT в данный момент. Как только мы будем готовы, они будут автоматически зачислены на ваш аккаунт.", "achievement.product_hunt_vote": "Голосовавший на Product Hunt", - "achievement.product_hunt_vote_description": "Вы поддержали Follow на Product Hunt", + "achievement.product_hunt_vote_description": "Вы поддержали Folo на Product Hunt", "activation.activate": "Активировать", "activation.description": "Во время публичного тестирования вам нужен код приглашения для использования этой функции.", "activation.title": "Код приглашения", @@ -103,6 +103,8 @@ "discover.target.lists": "Списки", "entry_actions.copied_notify": "{{which}} скопировано в буфер обмена.", "entry_actions.copy_link": "Копировать ссылку", + "entry_actions.exported_notify": "Статья экспортирована в PDF.", + "entry_actions.export_as_pdf": "Экспортировать в PDF", "entry_actions.copy_title": "Копировать заголовок", "entry_actions.delete": "Удалить", "entry_actions.deleted": "Удалено.", @@ -241,12 +243,12 @@ "mark_all_read_button.mark_as_read": "Отметить как прочитанное", "mark_all_read_button.undo": "Отменить", "new_user_guide.intro.description": "Это руководство поможет вам начать работу с приложением.", - "new_user_guide.intro.title": "Добро пожаловать в Follow!", + "new_user_guide.intro.title": "Добро пожаловать в Folo!", "new_user_guide.outro.description": "Вы завершили руководство. Приятного путешествия!", "new_user_guide.outro.title": "Все готово!", - "new_user_guide.step.activation.description": "Не беспокойтесь, вы можете продолжать использовать Follow без кода приглашения.", + "new_user_guide.step.activation.description": "Не беспокойтесь, вы можете продолжать использовать Folo без кода приглашения.", "new_user_guide.step.activation.title": "Активируйте вашу учетную запись", - "new_user_guide.step.automation.description": "- Follow использует передовой ИИ для помощи в операциях.\n- Правила действий позволяют автоматизировать различные операции на источниках, соответствующих конкретным условиям.\n- Интеграции позволяют сохранять записи в другие сервисы.", + "new_user_guide.step.automation.description": "- Folo использует передовой ИИ для помощи в операциях.\n- Правила действий позволяют автоматизировать различные операции на источниках, соответствующих конкретным условиям.\n- Интеграции позволяют сохранять записи в другие сервисы.", "new_user_guide.step.behavior.title": "Поведение", "new_user_guide.step.behavior.unread_question.content": "Выберите, как вы хотите отмечать как прочитанное.", "new_user_guide.step.behavior.unread_question.description": "Не переживайте, вы можете изменить это позже в настройках.", @@ -258,10 +260,10 @@ "new_user_guide.step.migrate.profile": "Настройте свой профиль", "new_user_guide.step.migrate.title": "Перенос из файла OPML", "new_user_guide.step.migrate.wallet": "Проверьте ваш кошелек", - "new_user_guide.step.power.description": "Follow использует технологию блокчейн в качестве механизма вознаграждения для активных пользователей и выдающихся создателей. Пользователи могут получить дополнительные услуги и преимущества, держа и используя токен Power. Создатели могут получать больше наград за предоставление качественного контента и услуг.", + "new_user_guide.step.power.description": "Folo использует технологию блокчейн в качестве механизма вознаграждения для активных пользователей и выдающихся создателей. Пользователи могут получить дополнительные услуги и преимущества, держа и используя токен Power. Создатели могут получать больше наград за предоставление качественного контента и услуг.", "new_user_guide.step.rsshub.info": "Всё в формате RSS. Наше сообщество [RSSHub](https://github.com/DIYgod/RSSHub), состоящее более чем из 1,000 разработчиков, потратило шесть лет на адаптацию почти тысячи сайтов, чтобы предоставить весь необходимый контент. Это включает платформы как X (Twitter), Instagram, PlayStation, Spotify, Telegram, YouTube и многие другие. Вы также можете написать собственные скрипты для адаптации дополнительных сайтов.", "new_user_guide.step.rsshub.title": "Подписка с RSSHub", - "new_user_guide.step.shortcuts.description1": "Горячие клавиши позволяют использовать Follow удобнее и эффективнее.", + "new_user_guide.step.shortcuts.description1": "Горячие клавиши позволяют использовать Folo удобнее и эффективнее.", "new_user_guide.step.shortcuts.description2": "Нажмите чтобы быстро просмотреть все горячие клавиши в любое время.", "new_user_guide.step.shortcuts.title": "Горячие клавиши", "new_user_guide.step.start_question.content": "Вы уже использовали другие RSS-ридеры?", @@ -269,7 +271,7 @@ "new_user_guide.step.start_question.option2": "Нет, это мой первый опыт с RSS-ридерами.", "new_user_guide.step.start_question.title": "Вопрос", "new_user_guide.step.trending.title": "Популярные ленты", - "new_user_guide.step.views.description": "Follow использует различные виды отображения для разных типов контента, чтобы предложить опыт, равный или лучший оригинальной платформе.", + "new_user_guide.step.views.description": "Folo использует различные виды отображения для разных типов контента, чтобы предложить опыт, равный или лучший оригинальной платформе.", "new_user_guide.step.views.title": "Просмотр", "notify.unfollow_feed": " был отписан.", "notify.unfollow_feed_many": "Все выбранные каналы были отписаны.", diff --git a/apps/desktop/locales/app/tr.json b/apps/desktop/locales/app/tr.json index b713986f1e..726367e8cb 100644 --- a/apps/desktop/locales/app/tr.json +++ b/apps/desktop/locales/app/tr.json @@ -1,7 +1,7 @@ { "achievement.all_done": "Tüm tamamlandı!", "achievement.first_claim_feed": "Besleme Sahibi", - "achievement.first_claim_feed_description": "Follow'da beslemenizi sahibi olun.", + "achievement.first_claim_feed_description": "Folo'da beslemenizi sahibi olun.", "ai_daily.title": "Öne Çıkan Haberler - {{title}}", "ai_daily.tooltip.content": "Burada, zaman çizelgenizden ( - ) AI tarafından seçilen ve sizin için önemli olabilecek haberler bulunmaktadır.", "ai_daily.tooltip.update_schedule": "Her gün saat 08:00 ve 20:00'de güncellenir.", @@ -28,6 +28,8 @@ "discover.target.label": "Arama hedefi", "discover.target.lists": "Listeler", "entry_actions.copy_link": "Bağlantıyı kopyala", + "entry_actions.exported_notify": "Makale PDF olarak dışa aktarıldı.", + "entry_actions.export_as_pdf": "PDF olarak dışa aktar", "entry_actions.failed_to_save_to_eagle": "Eagle'a kaydetme başarısız oldu.", "entry_actions.failed_to_save_to_instapaper": "Instapaper'a kaydetme başarısız oldu.", "entry_actions.failed_to_save_to_readwise": "Readwise'a kaydetme başarısız oldu.", diff --git a/apps/desktop/locales/app/zh-CN.json b/apps/desktop/locales/app/zh-CN.json index abf2676a3a..b94c9ba285 100644 --- a/apps/desktop/locales/app/zh-CN.json +++ b/apps/desktop/locales/app/zh-CN.json @@ -1,16 +1,16 @@ { "achievement.all_done": "大功告成！", "achievement.alpha_tester": "Alpha 内测用户", - "achievement.alpha_tester_description": "早期 Follow Alpha 版本的内测用户", + "achievement.alpha_tester_description": "早期 Folo Alpha 版本的内测用户", "achievement.description": "成为硬核玩家，赚取 NFT。", "achievement.feed_booster": "订阅源助力者", - "achievement.feed_booster_description": "在 Follow 上助力订阅源", + "achievement.feed_booster_description": "在 Folo 上助力订阅源", "achievement.first_claim_feed": "订阅源所有者", - "achievement.first_claim_feed_description": "在 Follow 上认证订阅源", + "achievement.first_claim_feed_description": "在 Folo 上认证订阅源", "achievement.first_create_list": "列表创作者", - "achievement.first_create_list_description": "在 Follow 上创建一个列表", + "achievement.first_create_list_description": "在 Folo 上创建一个列表", "achievement.follow_special_feed": "特别订阅", - "achievement.follow_special_feed_description": "在 Follow 上订阅一个特别的订阅源", + "achievement.follow_special_feed_description": "在 Folo 上订阅一个特别的订阅源", "achievement.list_subscribe_100": "100 个列表订阅者", "achievement.list_subscribe_100_description": "创建的列表有 100 人订阅", "achievement.list_subscribe_50": "50 个列表订阅者", @@ -19,7 +19,7 @@ "achievement.list_subscribe_50_description": "创建的列表有 50 人订阅", "achievement.nft_coming_soon": "目前你无法赚取 NFT。一旦我们准备好，它们将自动记入你的帐户。", "achievement.product_hunt_vote": "Product Hunt 支持者", - "achievement.product_hunt_vote_description": "在 Product Hunt 上给 Follow 投票", + "achievement.product_hunt_vote_description": "在 Product Hunt 上给 Folo 投票", "activation.activate": "激活", "activation.description": "在公测阶段，预览版用户使用此功能会受限。", "activation.title": "邀请码", @@ -108,6 +108,8 @@ "entry_actions.image_gallery": "图片库", "entry_actions.copied_notify": "{{which}}已复制到剪贴板。", "entry_actions.copy_link": "复制链接", + "entry_actions.exported_notify": "文章已导出为 PDF。", + "entry_actions.export_as_pdf": "导出为 PDF", "entry_actions.copy_title": "复制标题", "entry_actions.delete": "删除", "entry_actions.deleted": "已删除", @@ -246,13 +248,16 @@ "mark_all_read_button.mark_all_as_read": "全部标记为已读", "mark_all_read_button.mark_as_read": "标记 为已读", "mark_all_read_button.undo": "撤销", + "new_user_guide.actions.next": "下一步", + "new_user_guide.actions.back": "上一步", + "new_user_guide.actions.finish": "完成", "new_user_guide.intro.description": "本指南将帮助你快速上手这款应用。", - "new_user_guide.intro.title": "欢迎使用 Follow！", + "new_user_guide.intro.title": "欢迎使用 Folo！", "new_user_guide.outro.description": "你已完成指南，祝你使用愉快！", "new_user_guide.outro.title": "一切就绪！", - "new_user_guide.step.activation.description": "别担心，你可以继续使用 Follow 而无需邀请码。", + "new_user_guide.step.activation.description": "别担心，你可以继续使用 Folo 而无需邀请码。", "new_user_guide.step.activation.title": "激活账号", - "new_user_guide.step.automation.description": "- Follow 利用先进的 AI 来协助你的操作\n- 自动化帮助你处理符合特定条件的来源\n- 集成帮助你将条目保存到其他服务中", + "new_user_guide.step.automation.description": "- Folo 利用先进的 AI 来协助你的操作\n- 自动化帮助你处理符合特定条件的来源\n- 集成帮助你将条目保存到其他服务中", "new_user_guide.step.behavior.title": "使用偏好", "new_user_guide.step.behavior.unread_question.content": "希望如何标记为已读。", "new_user_guide.step.behavior.unread_question.description": "别担心，你可以稍后在设置中再次更改。", @@ -264,10 +269,10 @@ "new_user_guide.step.migrate.profile": "设置你的个人资料", "new_user_guide.step.migrate.title": "从 OPML 文件导入", "new_user_guide.step.migrate.wallet": "检查你的钱包", - "new_user_guide.step.power.description": "Follow 使用区块链技术作为活跃用户和优秀创作者的激励机制。用户可以通过持有和使用 Power 来获得更多服务和福利。创作者可以通过提供高质量的内容和服务来获得更多奖励。", + "new_user_guide.step.power.description": "Folo 使用区块链技术作为活跃用户和优秀创作者的激励机制。用户可以通过持有和使用 Power 来获得更多服务和福利。创作者可以通过提供高质量的内容和服务来获得更多奖励。", "new_user_guide.step.rsshub.info": "一切皆可 RSS。我们的 RSSHub 社区由超过 1,000 名开发者组成，经过六年的努力，适配了近千个网站，以提供几乎所有你需要的内容。这包括 X（Twitter）、Instagram、PlayStation、Spotify、Telegram、YouTube 等平台。你还可以编写自己的脚本来适配其他网站。", "new_user_guide.step.rsshub.title": "从 RSSHub 订阅", - "new_user_guide.step.shortcuts.description1": "快捷键让你更方便、高效地使用 Follow。", + "new_user_guide.step.shortcuts.description1": "快捷键让你更方便、高效地使用 Folo", "new_user_guide.step.shortcuts.description2": "随时按 快速查看所有快捷键。", "new_user_guide.step.shortcuts.title": "快捷键", "new_user_guide.step.start_question.content": "你以前使用过其它 RSS 阅读器吗？", @@ -275,7 +280,7 @@ "new_user_guide.step.start_question.option2": "不，这是我第一次使用 RSS 阅读器。", "new_user_guide.step.start_question.title": "问题", "new_user_guide.step.trending.title": "热门订阅源", - "new_user_guide.step.views.description": "Follow 针对不同类型的内容使用不同的视图，以提供与原平台相当或更好的体验。", + "new_user_guide.step.views.description": "Folo 针对不同类型的内容使用不同的视图，以提供与原平台相当或更好的体验。", "new_user_guide.step.views.title": "视图", "notify.unfollow_feed": "已取消订阅 ", "notify.unfollow_feed_many": "已取消订阅选中的订阅源。", diff --git a/apps/desktop/locales/app/zh-HK.json b/apps/desktop/locales/app/zh-HK.json index 2029af5004..c4425cec69 100644 --- a/apps/desktop/locales/app/zh-HK.json +++ b/apps/desktop/locales/app/zh-HK.json @@ -1,25 +1,25 @@ { "achievement.all_done": "全部完成！", "achievement.alpha_tester": "Alpha 內部測試使用者", - "achievement.alpha_tester_description": "早期 Follow Alpha 版本的內部測試使用者", + "achievement.alpha_tester_description": "早期 Folo Alpha 版本的內部測試使用者", "achievement.description": "成為硬核玩家並鑄造 NFTs", - "achievement.feed_booster": "訂閲源加成者", - "achievement.feed_booster_description": "你在 Follow 上加成了訂閲源", + "achievement.feed_booster": "訂閱源加成者", + "achievement.feed_booster_description": "你在 Folo 上加成了訂閱源", "achievement.first_claim_feed": "Feed 擁有者", - "achievement.first_claim_feed_description": "你在 Follow 上擁有你的 Feed", + "achievement.first_claim_feed_description": "你在 Folo 上擁有你的 Feed", "achievement.first_create_list": "清單創作家", - "achievement.first_create_list_description": "在 Follow 上創建一個清單", + "achievement.first_create_list_description": "在 Folo 上建立一個清單", "achievement.follow_special_feed": "特別的追隨", - "achievement.follow_special_feed_description": "在 Follow 上追隨一個特別的訂閱源", + "achievement.follow_special_feed_description": "在 Folo 上追隨一個特別的訂閱源", "achievement.list_subscribe_100": "100 個清單追隨者", - "achievement.list_subscribe_100_description": "創建的清單被 100 人追隨", + "achievement.list_subscribe_100_description": "建立的清單被 100 人追隨", "achievement.list_subscribe_50": "50 個清單追隨者", "achievement.list_subscribe_500": "500 個清單追隨者", - "achievement.list_subscribe_500_description": "創建的清單被 500 人追隨", - "achievement.list_subscribe_50_description": "創建的清單被 50 人追隨", - "achievement.nft_coming_soon": "你目前不能鑄造NFT。一旦準備好，它們會自動記入你的賬戶。", + "achievement.list_subscribe_500_description": "建立的清單被 500 人追隨", + "achievement.list_subscribe_50_description": "建立的清單被 50 人追隨", + "achievement.nft_coming_soon": "你目前不能鑄造NFT。一旦準備好，它們會自動記入你的帳戶。", "achievement.product_hunt_vote": "Product Hunt 支持者", - "achievement.product_hunt_vote_description": "在 Product Hunt 上給 Follow 投票", + "achievement.product_hunt_vote_description": "在 Product Hunt 上給 Folo 投票", "activation.activate": "啟動", "activation.description": "在公測階段，預覽版使用者使用此功能受限", "activation.title": "邀請代碼", @@ -32,7 +32,7 @@ "app.toggle_sidebar": "切換側邊欄", "beta_access": "Beta 版本", "boost.boost_feed": "加成", - "boost.boost_feed_description": "為動態加成以解鎖額外優惠，訂閱的用戶將會感激您帶來的好處！", + "boost.boost_feed_description": "為動態加成以解鎖額外優惠，訂閱的使用者將會感激您帶來的好處！", "boost.boost_success": "🎉 加成成功！", "boost.boost_success_thanks": "多謝您的支持！", "boost.expired_description": "您目前無法再添加加成點數，但隨時可以繼續加成。您現有的加成將於 {{expiredDate, datetime}} 到期。", @@ -65,11 +65,11 @@ "discover.default_option": " (預設)", "discover.feed_description": "此訂閱源的描述如下，你可以根據相關資訊填寫參數表格。", "discover.feed_maintainers": "此訂閱源由 RSSHub 提供，感謝 ", - "discover.import.click_to_upload": "上傳 OPML 文件", + "discover.import.click_to_upload": "上傳 OPML 檔案", "discover.import.conflictItems": "衝突項目", - "discover.import.new_import_opml": "如果您以前使用過RSS,您可以將資料配置匯出到OPML文件,並在此處匯入", + "discover.import.new_import_opml": "如果您以前使用過RSS,您可以將資料配置匯出到OPML檔案,並在此處匯入", "discover.import.noItems": "沒有項目", - "discover.import.opml": "OPML 文件", + "discover.import.opml": "OPML 檔案", "discover.import.parsedErrorItems": "解析錯誤項目", "discover.import.result": " 個訂閱源已成功匯入， 個已訂閱， 個匯入失敗。", "discover.import.successfulItems": "成功項目", @@ -79,7 +79,7 @@ "discover.inbox.handle": "識別編號", "discover.inbox.secret": "密鑰", "discover.inbox.title": "標題", - "discover.inbox.webhooks_docs": "Webhooks 文件", + "discover.inbox.webhooks_docs": "Webhooks 檔案", "discover.inbox_create": "新增收件匣", "discover.inbox_create_description": "你還沒有收件匣，建立一個收件匣以通過收件匣接收資訊。", "discover.inbox_create_error": "建立收件匣失敗", @@ -98,12 +98,18 @@ "discover.preview": "預覽", "discover.rss_hub_route": "RSSHub 路由", "discover.rss_url": "RSS 網址", + "discover.search.results_one": "找到 {{count}} 個訂閱源", + "discover.search.results_other": "找到 {{count}} 個訂閱源", + "discover.search.results_zero": "未找到訂閱源", "discover.select_placeholder": "選擇", "discover.target.feeds": "訂閱源", "discover.target.label": "搜尋", "discover.target.lists": "清單", - "entry_actions.copied_notify": "{{which}}已複製到剪貼板", - "entry_actions.copy_link": "複製鏈結", + "entry_actions.image_gallery": "圖片庫", + "entry_actions.copied_notify": "{{which}}已複製到剪貼簿", + "entry_actions.copy_link": "複製連結", + "entry_actions.exported_notify": "文章已匯出為 PDF。", + "entry_actions.export_as_pdf": "匯出為 PDF", "entry_actions.copy_title": "複製標題", "entry_actions.delete": "刪除", "entry_actions.deleted": "已刪除", @@ -152,7 +158,7 @@ "entry_content.report_issue": "報告問題", "entry_content.support_amount": "{{amount}} 人支持了此訂閱源的創作者", "entry_content.support_creator": "支持創作者", - "entry_content.web_app_notice": "網頁應用可能不支持此內容類型。你可以下載桌面應用程式。", + "entry_content.web_app_notice": "網頁應用可能不支援此內容類型。你可以下載桌面應用程式。", "entry_list.zero_unread": "全部已讀", "entry_list_header.daily_report": "每日報告", "entry_list_header.grid": "Grid", @@ -193,7 +199,7 @@ "feed_form.add_feed": "新增訂閱源", "feed_form.add_follow": "新增追隨", "feed_form.category": "分類", - "feed_form.category_description": "默認情況下，你的追隨會按網站分組。", + "feed_form.category_description": "預設情況下，你的追隨會按網站分組。", "feed_form.error_fetching_feed": "獲取訂閱源時出錯", "feed_form.fee": "追隨費用", "feed_form.fee_description": "要追隨此清單，您必須向清單創建者支付費用。", @@ -207,7 +213,7 @@ "feed_form.private_follow_description": "此追隨是否在你的個人資料頁面上公開可見", "feed_form.retry": "重試", "feed_form.title": "標題", - "feed_form.title_description": "此資訊流的自定義標題。留空則使用默認標題。", + "feed_form.title_description": "此資訊流的自定義標題。留空則使用預設標題。", "feed_form.unfollow": "取消追隨", "feed_form.update": "更新", "feed_form.update_follow": "更新追隨", @@ -221,7 +227,7 @@ "feed_item.error_since": "錯誤始於", "feed_item.not_publicly_visible": "在你的個人頁面上不公開可見", "feed_view_type.articles": "文章", - "feed_view_type.audios": "音頻", + "feed_view_type.audios": "音訊", "feed_view_type.notifications": "通知", "feed_view_type.pictures": "圖片", "feed_view_type.social_media": "社交媒體", @@ -230,6 +236,7 @@ "login.continueWith": "繼續使用 {{provider}}", "login.email": "電子郵件", "login.forget_password.note": "忘記密碼？", + "login.or": "或", "login.password": "密碼", "login.signUp": "使用電子郵件註冊", "login.submit": "提交", @@ -242,12 +249,12 @@ "mark_all_read_button.mark_as_read": "標記 為已讀", "mark_all_read_button.undo": "撤銷", "new_user_guide.intro.description": "本指南將幫助你輕鬆開始使用這個應用程式", - "new_user_guide.intro.title": "歡迎使用 Follow！", + "new_user_guide.intro.title": "歡迎使用 Folo！", "new_user_guide.outro.description": "你已完成指南，祝你使用愉快！", "new_user_guide.outro.title": "一切就緒！", - "new_user_guide.step.activation.description": "別擔心，繼續使用 Follow 無需邀請碼", - "new_user_guide.step.activation.title": "啟動賬戶", - "new_user_guide.step.automation.description": "- Follow 利用先進的 AI 來協助你的動作\n- 自動化幫助你處理符合特定條件的來源\n- 集成幫助你將條目儲存到其他服務中", + "new_user_guide.step.activation.description": "別擔心，繼續使用 Folo 無需邀請碼", + "new_user_guide.step.activation.title": "啟動帳戶", + "new_user_guide.step.automation.description": "- Folo 利用先進的 AI 來協助你的動作\n- 自動化幫助你處理符合特定條件的來源\n- 集成幫助你將條目儲存到其他服務中", "new_user_guide.step.behavior.title": "使用偏好", "new_user_guide.step.behavior.unread_question.content": "希望如何標記為已讀", "new_user_guide.step.behavior.unread_question.description": "別擔心，你可以在設定中再次更改", @@ -255,14 +262,14 @@ "new_user_guide.step.behavior.unread_question.option2": "平衡：懸停或滾出視野時自動標記為已讀", "new_user_guide.step.behavior.unread_question.option3": "被動：僅在點擊時標記為已讀", "new_user_guide.step.features.actions.description": "自動化規則允許你對不同的訂閱執行不同的動作\n- 使用 AI 進行摘要或翻譯\n- 配置閱讀條目的方式\n- 啟用新條目的通知或靜音\n- 重寫或封鎖特定條目\n- 將新條目發送到 webhook 地址", - "new_user_guide.step.features.integration.description": "集成允許你將條目儲存到其他服務。目前支持的服務有:\n- Eagle\n- Readwise\n- Instapaper\n- Obsidian\n- Outline\n- Readeck", + "new_user_guide.step.features.integration.description": "集成允許你將條目儲存到其他服務。目前支援的服務有:\n- Eagle\n- Readwise\n- Instapaper\n- Obsidian\n- Outline\n- Readeck", "new_user_guide.step.migrate.profile": "設定你的個人資料", "new_user_guide.step.migrate.title": "從 OPML 檔案匯入", "new_user_guide.step.migrate.wallet": "檢查你的銀包", - "new_user_guide.step.power.description": "Follow 使用區塊鏈技術作為活躍使用者和優秀創作者的激勵機制。使用者可以通過持有和使用 Power 來獲得更多服務和福利。創作者可以通過提供高質量的內容和服務來獲得更多獎勵。", - "new_user_guide.step.rsshub.info": "一切皆可 RSS。我們的 RSSHub 社區由超過 1,000 名開發者組成，經過六年的努力，適用於近千個網站，以提供幾乎所有你需要的內容。這包括 X（Twitter）、Instagram、PlayStation、Spotify、Telegram、YouTube 等平台。你還可以編寫自己的程式碼來支持其他網站。", + "new_user_guide.step.power.description": "Folo 使用區塊鏈技術作為活躍使用者和優秀創作者的激勵機制。使用者可以通過持有和使用 Power 來獲得更多服務和福利。創作者可以通過提供高質量的內容和服務來獲得更多獎勵。", + "new_user_guide.step.rsshub.info": "一切皆可 RSS。我們的 RSSHub 社區由超過 1,000 名開發者組成，經過六年的努力，適用於近千個網站，以提供幾乎所有你需要的內容。這包括 X（Twitter）、Instagram、PlayStation、Spotify、Telegram、YouTube 等平台。你還可以編寫自己的程式碼來支援其他網站。", "new_user_guide.step.rsshub.title": "從 RSSHub 訂閱", - "new_user_guide.step.shortcuts.description1": "快捷鍵讓你更方便、高效地使用 Follow", + "new_user_guide.step.shortcuts.description1": "快捷鍵讓你更方便、高效地使用 Folo", "new_user_guide.step.shortcuts.description2": "隨時按 快速查看所有快捷鍵", "new_user_guide.step.shortcuts.title": "快捷鍵", "new_user_guide.step.start_question.content": "你以前使用過其他 RSS 閱讀器嗎？", @@ -270,10 +277,10 @@ "new_user_guide.step.start_question.option2": "不，這是我第一次使用 RSS 閱讀器", "new_user_guide.step.start_question.title": "問題", "new_user_guide.step.trending.title": "熱門訂閱源", - "new_user_guide.step.views.description": "Follow 針對不同類型的內容使用不同的視圖，以提供與原平台相當或更好的體驗", + "new_user_guide.step.views.description": "Folo 針對不同類型的內容使用不同的視圖，以提供與原平台相當或更好的體驗", "new_user_guide.step.views.title": "視圖", "notify.unfollow_feed": "已取消追隨 ", - "notify.unfollow_feed_many": "已取消追隨所有選取的訂閲源", + "notify.unfollow_feed_many": "已取消追隨所有選取的訂閱源", "notify.update_info": "{{app_name}} 已準備好更新！", "notify.update_info_1": "點擊以重新啟動", "notify.update_info_2": "點擊以重新載入頁面", @@ -285,7 +292,7 @@ "player.forward_10s": "快進 10 秒", "player.full_screen": "全螢幕", "player.mute": "靜音", - "player.open_entry": "打開條目", + "player.open_entry": "開啟條目", "player.pause": "暫停", "player.play": "播放", "player.playback_rate": "播放速度", @@ -338,13 +345,13 @@ "sidebar.feed_actions.navigate_to_feed": "導航到訂閱源", "sidebar.feed_actions.navigate_to_list": "導航到清單", "sidebar.feed_actions.new_inbox": "新收件匣", - "sidebar.feed_actions.open_feed_in_browser": "在{{which}}中打開訂閱源", - "sidebar.feed_actions.open_list_in_browser": "在{{which}}中打開清單", - "sidebar.feed_actions.open_site_in_browser": "在{{which}}中打開網站", - "sidebar.feed_actions.reset_feed": "重置訂閲源", - "sidebar.feed_actions.reset_feed_error": "重置訂閲源失敗", - "sidebar.feed_actions.reset_feed_success": "訂閲源已成功重置", - "sidebar.feed_actions.resetting_feed": "正在重置訂閲源...", + "sidebar.feed_actions.open_feed_in_browser": "在{{which}}中開啟訂閱源", + "sidebar.feed_actions.open_list_in_browser": "在{{which}}中開啟清單", + "sidebar.feed_actions.open_site_in_browser": "在{{which}}中開啟網站", + "sidebar.feed_actions.reset_feed": "重置訂閱源", + "sidebar.feed_actions.reset_feed_error": "重置訂閱源失敗", + "sidebar.feed_actions.reset_feed_success": "訂閱源已成功重置", + "sidebar.feed_actions.resetting_feed": "正在重置訂閱源...", "sidebar.feed_actions.unfollow": "取消追隨", "sidebar.feed_actions.unfollow_feed": "取消追隨訂閱源", "sidebar.feed_actions.unfollow_feed_many": "取消追隨所有選取的訂閱源", @@ -371,10 +378,10 @@ "sync_indicator.synced": "已與伺服器同步", "tip_modal.amount": "金額", "tip_modal.claim_feed": "認領這個訂閱源", - "tip_modal.create_wallet": "免費創建", + "tip_modal.create_wallet": "免費建立", "tip_modal.feed_owner": "訂閱源擁有者", "tip_modal.low_balance": "你的餘額不足以覆蓋此贊助。請調整金額。", - "tip_modal.no_wallet": "你尚未擁有銀包。請創建一個銀包以進行贊助。", + "tip_modal.no_wallet": "你尚未擁有錢包。請建立一個錢包以進行贊助。", "tip_modal.tip_amount_sent": "已經發送給作者", "tip_modal.tip_now": "立刻贊助", "tip_modal.tip_sent": "贊助成功！感謝你的支持。", @@ -385,7 +392,7 @@ "trending.feed": "熱門資訊", "trending.list": "熱門清單", "trending.user": "熱門使用者", - "user_button.account": "帳號", + "user_button.account": "帳戶", "user_button.achievement": "成就", "user_button.actions": "自動化", "user_button.download_desktop_app": "下載桌面應用程式", @@ -412,7 +419,7 @@ "words.inbox": "收件匣", "words.items": "項目", "words.language": "語言", - "words.link": "鏈結", + "words.link": "連結", "words.lists": "清單", "words.load_archived_entries": "載入已存檔的條目", "words.login": "登入", diff --git a/apps/desktop/locales/app/zh-TW.json b/apps/desktop/locales/app/zh-TW.json index 884fff3b30..7490e91161 100644 --- a/apps/desktop/locales/app/zh-TW.json +++ b/apps/desktop/locales/app/zh-TW.json @@ -1,16 +1,16 @@ { "achievement.all_done": "大功告成！", "achievement.alpha_tester": "Alpha 測試者", - "achievement.alpha_tester_description": "您參與了 Follow 的 Alpha 測試。", + "achievement.alpha_tester_description": "您參與了 Folo 的 Alpha 測試。", "achievement.description": "成為硬派玩家，鑄造 NFT。", "achievement.feed_booster": "RSS 摘要加成者", - "achievement.feed_booster_description": "在 Follow 上加成 RSS 摘要", + "achievement.feed_booster_description": "在 Folo 上加成 RSS 摘要", "achievement.first_claim_feed": "RSS 摘要作者", - "achievement.first_claim_feed_description": "在 Follow 上認證 RSS 摘要", + "achievement.first_claim_feed_description": "在 Folo 上認證 RSS 摘要", "achievement.first_create_list": "列表創建者", - "achievement.first_create_list_description": "在 Follow 上創建一個列表", + "achievement.first_create_list_description": "在 Folo 上創建一個列表", "achievement.follow_special_feed": "特別 RSS 摘要跟隨者", - "achievement.follow_special_feed_description": "在 Follow 上跟隨了一個特別的 RSS 摘要", + "achievement.follow_special_feed_description": "在 Folo 上跟隨了一個特別的 RSS 摘要", "achievement.list_subscribe_100": "100 名列表訂閱者", "achievement.list_subscribe_100_description": "創建的列表有 100 名訂閱者", "achievement.list_subscribe_50": "50 名列表訂閱者", @@ -19,7 +19,7 @@ "achievement.list_subscribe_50_description": "創建的列表有 50 名訂閱者", "achievement.nft_coming_soon": "目前您無法鑄造 NFT。一旦我們準備好，NFT 將自動轉移到您的帳戶。", "achievement.product_hunt_vote": "Product Hunt 投票", - "achievement.product_hunt_vote_description": "您在 Product Hunt 上投票給了 Follow", + "achievement.product_hunt_vote_description": "您在 Product Hunt 上投票給了 Folo", "activation.activate": "啟用", "activation.description": "在公開測試階段，您需要邀請碼才能使用此功能。", "activation.title": "邀請碼", @@ -104,6 +104,8 @@ "discover.target.lists": "列表", "entry_actions.copied_notify": "{{which}}已複製到剪貼簿", "entry_actions.copy_link": "複製連結", + "entry_actions.exported_notify": "文章已匯出為 PDF。", + "entry_actions.export_as_pdf": "匯出為 PDF", "entry_actions.copy_title": "複製標題", "entry_actions.delete": "刪除", "entry_actions.deleted": "已刪除。", @@ -242,12 +244,12 @@ "mark_all_read_button.mark_as_read": "標記 為已讀", "mark_all_read_button.undo": "復原", "new_user_guide.intro.description": "這份指南將幫助您快速上手這款應用程式。", - "new_user_guide.intro.title": "歡迎來到 Follow！", + "new_user_guide.intro.title": "歡迎來到 Folo！", "new_user_guide.outro.description": "您已完成指南，開始您的探索之旅吧！", "new_user_guide.outro.title": "準備就緒！", - "new_user_guide.step.activation.description": "別擔心，即使沒有邀請碼，您仍然可以繼續使用 Follow。", + "new_user_guide.step.activation.description": "別擔心，即使沒有邀請碼，您仍然可以繼續使用 Folo。", "new_user_guide.step.activation.title": "帳號啟用", - "new_user_guide.step.automation.description": "- Follow 利用 AI 技術協助您進行操作。\n- 指令允許您自動化對符合特定條件的來源執行各種操作。\n- 整合功能允許您將項目保存到其他服務。", + "new_user_guide.step.automation.description": "- Folo 利用 AI 技術協助您進行操作。\n- 指令允許您自動化對符合特定條件的來源執行各種操作。\n- 整合功能允許您將項目保存到其他服務。", "new_user_guide.step.behavior.title": "行為設定", "new_user_guide.step.behavior.unread_question.content": "選擇您想要的標記已讀方式。", "new_user_guide.step.behavior.unread_question.description": "別擔心，您可以在偏好設定中隨時更改。", @@ -259,10 +261,10 @@ "new_user_guide.step.migrate.profile": "設定您的個人資料", "new_user_guide.step.migrate.title": "從 OPML 文件導入", "new_user_guide.step.migrate.wallet": "檢查您的錢包", - "new_user_guide.step.power.description": "Follow 使用區塊鏈技術來獎勵活躍使用者和優秀創作者。使用者可以透過 Power Token 獲得更多服務和福利，創作者可以透過提供高品質的內容和服務獲得更多獎勵。", + "new_user_guide.step.power.description": "Folo 使用區塊鏈技術來獎勵活躍使用者和優秀創作者。使用者可以透過 Power Token 獲得更多服務和福利，創作者可以透過提供高品質的內容和服務獲得更多獎勵。", "new_user_guide.step.rsshub.info": "萬物皆可 RSS 我們的 [RSSHub](https://github.com/DIYgod/RSSHub) 社群由超過 1,000 名開發者組成，花了六年時間支援了近千個網站，為您提供幾乎所有需要的內容。這些網站包括 X（Twitter）、Instagram、PlayStation、Spotify、Telegram、YouTube 等平台。您也可以撰寫自己的腳本來新增更多網站支援。", "new_user_guide.step.rsshub.title": "從 RSSHub 訂閱", - "new_user_guide.step.shortcuts.description1": "快捷鍵讓您更方便且有效率的使用 Follow。", + "new_user_guide.step.shortcuts.description1": "快捷鍵讓您更方便且有效率的使用 Folo。", "new_user_guide.step.shortcuts.description2": "按 隨時快速查看所有快捷鍵。", "new_user_guide.step.shortcuts.title": "快捷鍵", "new_user_guide.step.start_question.content": "您曾經使用過其他 RSS 閱讀器嗎？", @@ -270,7 +272,7 @@ "new_user_guide.step.start_question.option2": "沒有，這是我第一次使用 RSS 閱讀器。", "new_user_guide.step.start_question.title": "問卷", "new_user_guide.step.trending.title": "熱門 RSS 摘要", - "new_user_guide.step.views.description": "Follow 針對不同類型的內容提供不同的視圖，讓您的使用體驗與原平台一樣出色，甚至更佳。", + "new_user_guide.step.views.description": "Folo 針對不同類型的內容提供不同的視圖，讓您的使用體驗與原平台一樣出色，甚至更佳。", "new_user_guide.step.views.title": "視圖", "notify.unfollow_feed": "已取消跟隨 ", "notify.unfollow_feed_many": "已取消跟隨正在選擇的 RSS 摘要。", diff --git a/apps/desktop/locales/common/zh-HK.json b/apps/desktop/locales/common/zh-HK.json index 7b94fd68ed..13df54d318 100644 --- a/apps/desktop/locales/common/zh-HK.json +++ b/apps/desktop/locales/common/zh-HK.json @@ -17,7 +17,8 @@ "words.all": "全部", "words.back": "返回", "words.copy": "複製", - "words.create": "創建", + "words.create": "建立", + "words.default": "預設", "words.delete": "刪除", "words.download": "下載", "words.edit": "編輯", @@ -32,7 +33,7 @@ "words.record": "記錄", "words.record_one": "記錄", "words.record_other": "記錄", - "words.reset": "重置", + "words.reset": "重設", "words.result": "結果", "words.result_one": "結果", "words.result_other": "結果", diff --git a/apps/desktop/locales/errors/zh-CN.json b/apps/desktop/locales/errors/zh-CN.json index 3bdaf545ca..65bca0eefe 100644 --- a/apps/desktop/locales/errors/zh-CN.json +++ b/apps/desktop/locales/errors/zh-CN.json @@ -7,6 +7,7 @@ "1003": "邀请码无效", "1004": "暂无权限", "1005": "内部错误", + "1006": "邮件地址未验证", "1100": "超出预览版订阅源最大数量限制", "1101": "超出预览版订阅列表最大数量限制", "1102": "超出预览版收件箱最大数量限制", @@ -60,5 +61,8 @@ "13003": "未找到 RSSHub", "13004": "RSSHub 用户限制已超出", "13005": "未找到 RSSHub 购买记录", - "13006": "RSSHub 配置无效" + "13006": "RSSHub 配置无效", + "14000": "文件无效", + "14001": "文件过大", + "14002": "上传失败" } diff --git a/apps/desktop/locales/errors/zh-HK.json b/apps/desktop/locales/errors/zh-HK.json index 7df781e481..ed6c9c6dc4 100644 --- a/apps/desktop/locales/errors/zh-HK.json +++ b/apps/desktop/locales/errors/zh-HK.json @@ -7,6 +7,7 @@ "1003": "無效邀請", "1004": "無權限", "1005": "內部錯誤", + "1006": "電子郵件未驗證", "1100": "超出預覽版訂閲源最大數量限制", "1101": "超出預覽版訂閲列表最大數量限制", "1102": "超出預覽版收件箱最大數量限制", @@ -20,12 +21,14 @@ "2011": "訂閱數量已達上限", "3000": "未找到條目", "4000": "已兌換", - "4001": "用戶錢包錯誤", + "4001": "使用者錢包錯誤", "4002": "餘額不足", "4003": "動態可提現餘額不足", - "4004": "目標用戶錢包錯誤", - "4005": "每日 power 计算中", + "4004": "目標使用者錢包錯誤", + "4005": "每日 power 計算中", "4006": "無效助力數量", + "4007": "無效的雙重驗證碼", + "4008": "需要雙重驗證碼", "4010": "無法參加空投", "4011": "空投發送中", "4012": "空投已發送", @@ -34,9 +37,9 @@ "5001": "邀請已存在", "5002": "邀請碼已被使用", "5003": "邀請碼不存在", - "6000": "未找到用戶", + "6000": "未找到使用者", "7000": "未找到設定", - "7001": "無效的設定標簽", + "7001": "無效的設定標籤", "7002": "無效的設定負載", "7003": "設定負載太大", "8000": "清單未找到", @@ -58,5 +61,8 @@ "13003": "未找到 RSSHub", "13004": "RSSHub 使用者數量已超過限制", "13005": "未找到 RSSHub 購買記錄", - "13006": "RSSHub 配置無效" + "13006": "RSSHub 配置無效", + "14000": "無效檔案", + "14001": "檔案太大", + "14002": "上傳失敗" } diff --git a/apps/desktop/locales/external/ar-DZ.json b/apps/desktop/locales/external/ar-DZ.json index a49aa2115a..c757a76510 100644 --- a/apps/desktop/locales/external/ar-DZ.json +++ b/apps/desktop/locales/external/ar-DZ.json @@ -8,8 +8,8 @@ "invitation.codeOptions.1": "ابحث عن أي مستخدم اختبار ألفا لدعوتك.", "invitation.codeOptions.2": "انضم إلى خادم Discord الخاص بنا للحصول على هدايا عرضية.", "invitation.codeOptions.3": "تابع حسابنا على X للحصول على هدايا عرضية.", - "invitation.earlyAccess": "حاليًا Follow في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذرًا، Follow حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccess": "حاليًا Folo في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذرًا، Folo حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} من Power لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", diff --git a/apps/desktop/locales/external/ar-IQ.json b/apps/desktop/locales/external/ar-IQ.json index a49aa2115a..c757a76510 100644 --- a/apps/desktop/locales/external/ar-IQ.json +++ b/apps/desktop/locales/external/ar-IQ.json @@ -8,8 +8,8 @@ "invitation.codeOptions.1": "ابحث عن أي مستخدم اختبار ألفا لدعوتك.", "invitation.codeOptions.2": "انضم إلى خادم Discord الخاص بنا للحصول على هدايا عرضية.", "invitation.codeOptions.3": "تابع حسابنا على X للحصول على هدايا عرضية.", - "invitation.earlyAccess": "حاليًا Follow في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذرًا، Follow حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccess": "حاليًا Folo في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذرًا، Folo حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} من Power لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", diff --git a/apps/desktop/locales/external/ar-SA.json b/apps/desktop/locales/external/ar-SA.json index 7989a2a736..a680860a8f 100644 --- a/apps/desktop/locales/external/ar-SA.json +++ b/apps/desktop/locales/external/ar-SA.json @@ -8,8 +8,8 @@ "invitation.codeOptions.1": "ابحث عن أي مستخدم اختبار ألفا لدعوتك.", "invitation.codeOptions.2": "انضم إلى خادمنا على Discord للحصول على هدايا دورية.", "invitation.codeOptions.3": "تابع حسابنا على X للحصول على هدايا دورية.", - "invitation.earlyAccess": "حاليًا، Follow في مرحلة الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", - "invitation.earlyAccessMessage": "😰 نأسف، Follow في مرحلة الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", + "invitation.earlyAccess": "حاليًا، Folo في مرحلة الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", + "invitation.earlyAccessMessage": "😰 نأسف، Folo في مرحلة الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} Power لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", diff --git a/apps/desktop/locales/external/ar-TN.json b/apps/desktop/locales/external/ar-TN.json index 806788df06..c46cc2e580 100644 --- a/apps/desktop/locales/external/ar-TN.json +++ b/apps/desktop/locales/external/ar-TN.json @@ -11,8 +11,8 @@ "invitation.codeOptions.1": "ابحث عن أي مستخدم اختبار ألفا لدعوتك.", "invitation.codeOptions.2": "انضم إلى خادم Discord الخاص بنا للحصول على هدايا عرضية.", "invitation.codeOptions.3": "تابع حسابنا على X للحصول على هدايا عرضية.", - "invitation.earlyAccess": "Follow حالياً في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذراً، Follow حالياً في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccess": "Folo حالياً في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذراً، Folo حالياً في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} من Power لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", diff --git a/apps/desktop/locales/external/ar-kw.json b/apps/desktop/locales/external/ar-kw.json index 7a71004f36..088b1c7318 100644 --- a/apps/desktop/locales/external/ar-kw.json +++ b/apps/desktop/locales/external/ar-kw.json @@ -11,8 +11,8 @@ "invitation.codeOptions.1": "ابحث عن أي مستخدم اختبار ألفا لدعوتك.", "invitation.codeOptions.2": "انضم إلى خادم Discord الخاص بنا للحصول على هدايا عرضية.", "invitation.codeOptions.3": "تابع حسابنا على X للحصول على هدايا عرضية.", - "invitation.earlyAccess": "تطبيق Follow حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذرًا، Follow في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccess": "تطبيق Folo حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذرًا، Folo في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} باور لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", diff --git a/apps/desktop/locales/external/de.json b/apps/desktop/locales/external/de.json index 9c662ce994..16294e84bb 100644 --- a/apps/desktop/locales/external/de.json +++ b/apps/desktop/locales/external/de.json @@ -7,9 +7,9 @@ "invitation.activate": "Activate", "invitation.codeOptions.1": "Looking for an alpha test user to invite you.", "invitation.codeOptions.2": "Join our Discord server for occasional giveaways.", - "invitation.codeOptions.3": "Follow our X account for occasional giveaways.", - "invitation.earlyAccess": "Follow is currently in early access and requires an invitation code to use.", - "invitation.earlyAccessMessage": "😰 Sorry, Follow is currently in early access and requires an invitation code to use.", + "invitation.codeOptions.3": "Folo our X account for occasional giveaways.", + "invitation.earlyAccess": "Folo is currently in early access and requires an invitation code to use.", + "invitation.earlyAccessMessage": "😰 Sorry, Folo is currently in early access and requires an invitation code to use.", "invitation.generateButton": "Generate new code", "invitation.generateCost": "You can spend {{INVITATION_PRICE}} Power to generate an invitation code for your friends.", "invitation.getCodeMessage": "You can get an invitation code through the following ways:", diff --git a/apps/desktop/locales/external/en.json b/apps/desktop/locales/external/en.json index 47a9dc7f7a..45035373b3 100644 --- a/apps/desktop/locales/external/en.json +++ b/apps/desktop/locales/external/en.json @@ -28,8 +28,8 @@ "invitation.codeOptions.1": "Looking for any alpha test user to invite you.", "invitation.codeOptions.2": "Join our Discord server for occasional giveaways.", "invitation.codeOptions.3": "Follow our X account for occasional giveaways.", - "invitation.earlyAccess": "Follow is currently in early access and requires an invitation code to use.", - "invitation.earlyAccessMessage": "😰 Sorry, Follow is currently in early access and requires an invitation code to use.", + "invitation.earlyAccess": "Folo is currently in early access and requires an invitation code to use.", + "invitation.earlyAccessMessage": "😰 Sorry, Folo is currently in early access and requires an invitation code to use.", "invitation.generateButton": "Generate new code", "invitation.generateCost": "You can spend {{INVITATION_PRICE}} Power to generate an invitation code for your friends.", "invitation.getCodeMessage": "You can get an invitation code in the following ways:", diff --git a/apps/desktop/locales/external/es.json b/apps/desktop/locales/external/es.json index 41d675f7d9..b8367baaa9 100644 --- a/apps/desktop/locales/external/es.json +++ b/apps/desktop/locales/external/es.json @@ -8,8 +8,8 @@ "invitation.codeOptions.1": "Buscando a algún usuario de prueba alfa que te invite.", "invitation.codeOptions.2": "Únete a nuestro servidor de Discord para sorteos ocasionales.", "invitation.codeOptions.3": "Sigue nuestra cuenta de X para sorteos ocasionales.", - "invitation.earlyAccess": "Follow está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", - "invitation.earlyAccessMessage": "😰 Lo sentimos, Follow está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", + "invitation.earlyAccess": "Folo está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", + "invitation.earlyAccessMessage": "😰 Lo sentimos, Folo está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", "invitation.generateButton": "Generar nuevo código", "invitation.generateCost": "Puedes gastar {{INVITATION_PRICE}} Power para generar un código de invitación para tus amigos.", "invitation.getCodeMessage": "Puedes obtener un código de invitación de las siguientes maneras:", diff --git a/apps/desktop/locales/external/fi.json b/apps/desktop/locales/external/fi.json index 4658a6f3c6..d4d8bce4ac 100644 --- a/apps/desktop/locales/external/fi.json +++ b/apps/desktop/locales/external/fi.json @@ -8,8 +8,8 @@ "invitation.codeOptions.1": "Etsi mikä tahansa alpha-testaaja kutsumaan sinut.", "invitation.codeOptions.2": "Liity Discord-palvelimeemme satunnaisia arvontoja varten.", "invitation.codeOptions.3": "Seuraa X-tiliämme satunnaisia arvontoja varten.", - "invitation.earlyAccess": "Follow on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", - "invitation.earlyAccessMessage": "😰 Pahoittelut, Follow on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", + "invitation.earlyAccess": "Folo on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", + "invitation.earlyAccessMessage": "😰 Pahoittelut, Folo on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", "invitation.generateButton": "Luo uusi koodi", "invitation.generateCost": "Voit käyttää {{INVITATION_PRICE}} Poweria luodaksesi kutsukoodin ystävillesi.", "invitation.getCodeMessage": "Voit saada kutsukoodin seuraavilla tavoilla:", diff --git a/apps/desktop/locales/external/fr.json b/apps/desktop/locales/external/fr.json index 374d035e8c..3c9419cf0b 100644 --- a/apps/desktop/locales/external/fr.json +++ b/apps/desktop/locales/external/fr.json @@ -10,8 +10,8 @@ "invitation.codeOptions.1": "Cherchez un utilisateur de test alpha pour vous inviter.", "invitation.codeOptions.2": "Rejoignez notre serveur Discord pour des cadeaux occasionnels.", "invitation.codeOptions.3": "Suivez notre compte X pour des cadeaux occasionnels.", - "invitation.earlyAccess": "Follow est actuellement en accès anticipé et nécessite un code d'invitation pour être utilisé.", - "invitation.earlyAccessMessage": "😰 Désolé, Follow est actuellement en accès anticipé et nécessite un code d'invitation pour être utilisé.", + "invitation.earlyAccess": "Folo est actuellement en accès anticipé et nécessite un code d'invitation pour être utilisé.", + "invitation.earlyAccessMessage": "😰 Désolé, Folo est actuellement en accès anticipé et nécessite un code d'invitation pour être utilisé.", "invitation.generateButton": "Générer un nouveau code", "invitation.generateCost": "Vous pouvez dépenser {{INVITATION_PRICE}} Power pour générer un code d'invitation pour vos amis.", "invitation.getCodeMessage": "Vous pouvez obtenir un code d'invitation de la manière suivante :", diff --git a/apps/desktop/locales/external/it.json b/apps/desktop/locales/external/it.json index 2aa785a5a4..7bf844fea1 100644 --- a/apps/desktop/locales/external/it.json +++ b/apps/desktop/locales/external/it.json @@ -8,8 +8,8 @@ "invitation.codeOptions.1": "Cerca qualsiasi utente alpha test per invitarti.", "invitation.codeOptions.2": "Unisciti al nostro server Discord per partecipare a estrazioni occasionali.", "invitation.codeOptions.3": "Segui il nostro account X per partecipare a estrazioni occasionali.", - "invitation.earlyAccess": "Follow è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", - "invitation.earlyAccessMessage": "😰 Ci dispiace, Follow è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", + "invitation.earlyAccess": "Folo è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", + "invitation.earlyAccessMessage": "😰 Ci dispiace, Folo è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", "invitation.generateButton": "Genera nuovo codice", "invitation.generateCost": "Puoi spendere {{INVITATION_PRICE}} Power per generare un codice di invito per i tuoi amici.", "invitation.getCodeMessage": "Puoi ottenere un codice di invito nei seguenti modi:", diff --git a/apps/desktop/locales/external/ja.json b/apps/desktop/locales/external/ja.json index 2ccfe9f0f8..7e1457db5a 100644 --- a/apps/desktop/locales/external/ja.json +++ b/apps/desktop/locales/external/ja.json @@ -27,8 +27,8 @@ "invitation.codeOptions.1": "招待してくれるアルファテストユーザーを探しましょう。", "invitation.codeOptions.2": "時折行われるプレゼント企画のために、私たちの Discord サーバーに参加しましょう。", "invitation.codeOptions.3": "時折行われるプレゼント企画のために、私たちの X アカウントをフォローしましょう。", - "invitation.earlyAccess": "現在、Follow はアーリーアクセス中で、利用には招待コードが必要です。", - "invitation.earlyAccessMessage": "😰 申し訳ありませんが、Follow は現在アーリーアクセス中で、招待コードが必要です。", + "invitation.earlyAccess": "現在、Folo はアーリーアクセス中で、利用には招待コードが必要です。", + "invitation.earlyAccessMessage": "😰 申し訳ありませんが、Folo は現在アーリーアクセス中で、招待コードが必要です。", "invitation.generateButton": "新しいコードを生成", "invitation.generateCost": "友達のために招待コードを生成するには、{{INVITATION_PRICE}} Power を消費できます。", "invitation.getCodeMessage": "以下の方法で招待コードを入手できます：", diff --git a/apps/desktop/locales/external/ko.json b/apps/desktop/locales/external/ko.json index 0c6b22e041..37f4d9d2cc 100644 --- a/apps/desktop/locales/external/ko.json +++ b/apps/desktop/locales/external/ko.json @@ -27,8 +27,8 @@ "invitation.codeOptions.1": "초대할 알파 테스트 사용자를 찾고 있습니다.", "invitation.codeOptions.2": "가끔 경품을 제공하는 Discord 서버에 가입하세요.", "invitation.codeOptions.3": "가끔 경품을 제공하는 X 계정을 팔로우하세요.", - "invitation.earlyAccess": "현재 Follow 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", - "invitation.earlyAccessMessage": "😰 죄송합니다. 현재 Follow 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", + "invitation.earlyAccess": "현재 Folo 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", + "invitation.earlyAccessMessage": "😰 죄송합니다. 현재 Folo 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", "invitation.generateButton": "새 코드 생성", "invitation.generateCost": "친구에게 초대 코드를 생성하려면 {{INVITATION_PRICE}} 파워를 사용할 수 있습니다.", "invitation.getCodeMessage": "다음 방법을 통해 초대 코드를 얻을 수 있습니다:", diff --git a/apps/desktop/locales/external/pt.json b/apps/desktop/locales/external/pt.json index 652e749da6..103329afc0 100644 --- a/apps/desktop/locales/external/pt.json +++ b/apps/desktop/locales/external/pt.json @@ -10,8 +10,8 @@ "invitation.codeOptions.1": "Procure um utilizador de teste alpha que o convide.", "invitation.codeOptions.2": "Junte-se ao nosso servidor Discord para receber ofertas ocasionais.", "invitation.codeOptions.3": "Siga a nossa conta no X para receber ofertas ocasionais.", - "invitation.earlyAccess": "O Follow está atualmente em acesso antecipado e requer um código de convite para ser utilizado.", - "invitation.earlyAccessMessage": "😰 Lamentamos, o Follow está atualmente em acesso antecipado e requer um código de convite.", + "invitation.earlyAccess": "O Folo está atualmente em acesso antecipado e requer um código de convite para ser utilizado.", + "invitation.earlyAccessMessage": "😰 Lamentamos, o Folo está atualmente em acesso antecipado e requer um código de convite.", "invitation.generateButton": "Gerar novo código", "invitation.generateCost": "Pode gastar {{INVITATION_PRICE}} Power para gerar um código de convite para os seus amigos.", "invitation.getCodeMessage": "Pode obter um código de convite das seguintes maneiras:", diff --git a/apps/desktop/locales/external/ru.json b/apps/desktop/locales/external/ru.json index eb198dcf5c..180da02587 100644 --- a/apps/desktop/locales/external/ru.json +++ b/apps/desktop/locales/external/ru.json @@ -27,8 +27,8 @@ "invitation.codeOptions.1": "Ищите пользователей для приглашения на альфа-тестирование.", "invitation.codeOptions.2": "Присоединяйтесь к нашему серверу Discord для участия в раздачах.", "invitation.codeOptions.3": "Подпишитесь на наш аккаунт X для участия в раздачах.", - "invitation.earlyAccess": "В настоящее время Follow находится в раннем доступе и требует пригласительного кода для использования.", - "invitation.earlyAccessMessage": "😰 Извините, Follow находится в раннем доступе и требует пригласительного кода для использования.", + "invitation.earlyAccess": "В настоящее время Folo находится в раннем доступе и требует пригласительного кода для использования.", + "invitation.earlyAccessMessage": "😰 Извините, Folo находится в раннем доступе и требует пригласительного кода для использования.", "invitation.generateButton": "Сгенерировать новый код", "invitation.generateCost": "Вы можете потратить {{INVITATION_PRICE}} Power, чтобы сгенерировать пригласительный код для ваших друзей.", "invitation.getCodeMessage": "Вы можете получить пригласительный код следующими способами:", diff --git a/apps/desktop/locales/external/tr.json b/apps/desktop/locales/external/tr.json index f05c465ccd..6ebdb03afa 100644 --- a/apps/desktop/locales/external/tr.json +++ b/apps/desktop/locales/external/tr.json @@ -14,8 +14,8 @@ "invitation.codeOptions.1": "Sizi davet edecek herhangi bir alfa test kullanıcısı aranıyor.", "invitation.codeOptions.2": "Ara sıra yapılan çekilişler için Discord sunucumuza katılın.", "invitation.codeOptions.3": "Ara sıra yapılan çekilişler için X hesabımızı takip edin.", - "invitation.earlyAccess": "Follow şu anda erken erişimde ve kullanmak için bir davet kodu gerektiriyor.", - "invitation.earlyAccessMessage": "😰 Üzgünüz, Follow şu anda erken erişimde ve kullanmak için bir davet kodu gerektiriyor.", + "invitation.earlyAccess": "Folo şu anda erken erişimde ve kullanmak için bir davet kodu gerektiriyor.", + "invitation.earlyAccessMessage": "😰 Üzgünüz, Folo şu anda erken erişimde ve kullanmak için bir davet kodu gerektiriyor.", "invitation.generateButton": "Yeni kod oluştur", "invitation.generateCost": "Arkadaşlarınız için bir davet kodu oluşturmak için {{INVITATION_PRICE}} Güç harcayabilirsiniz.", "invitation.getCodeMessage": "Aşağıdaki yollarla bir davet kodu alabilirsiniz:", diff --git a/apps/desktop/locales/external/zh-CN.json b/apps/desktop/locales/external/zh-CN.json index 6d06634dda..dba4dd4db1 100644 --- a/apps/desktop/locales/external/zh-CN.json +++ b/apps/desktop/locales/external/zh-CN.json @@ -28,8 +28,8 @@ "invitation.codeOptions.1": "寻找内测用户帮你生成邀请码。", "invitation.codeOptions.2": "加入官方 Discord 频道，不定期发放邀请码。", "invitation.codeOptions.3": "关注官方 X 账号动态，不定期发放邀请码。", - "invitation.earlyAccess": "Follow 目前处于早期体验阶段，需要邀请码才能使用。", - "invitation.earlyAccessMessage": "😰 抱歉，Follow 目前处于早期体验阶段，需要邀请码才能使用。", + "invitation.earlyAccess": "Folo 目前处于早期体验阶段，需要邀请码才能使用。", + "invitation.earlyAccessMessage": "😰 抱歉，Folo 目前处于早期体验阶段，需要邀请码才能使用。", "invitation.generateButton": "生成邀请码", "invitation.generateCost": "花费 {{INVITATION_PRICE}} Power 生成一个邀请码给你的朋友。", "invitation.getCodeMessage": "通过以下方式获取：", diff --git a/apps/desktop/locales/external/zh-HK.json b/apps/desktop/locales/external/zh-HK.json index 4f7b421a02..d194f281c7 100644 --- a/apps/desktop/locales/external/zh-HK.json +++ b/apps/desktop/locales/external/zh-HK.json @@ -1,8 +1,8 @@ { - "copied_link": "鏈接已複製到剪貼簿", + "copied_link": "連結已複製到剪貼簿", "feed.actions.follow": "訂閲", "feed.actions.followed": "已訂閲", - "feed.copy_feed_url": "複製鏈接", + "feed.copy_feed_url": "複製連結", "feed.feeds_one": "訂閲源", "feed.feeds_other": "訂閲源", "feed.follow_to_view_all": "跟隨以查看所有 {{count}} 個訂閲源...", @@ -14,7 +14,7 @@ "feed.preview": "預覽", "feed.read_one": "閱讀", "feed.read_other": "閱讀數", - "feed.view_feed_url": "查看鏈接", + "feed.view_feed_url": "查看連結", "feed_item.claimed_by_owner": "訂閲源所有者", "feed_item.claimed_by_unknown": "未知所有者", "feed_item.claimed_by_you": "由你認領", @@ -28,8 +28,8 @@ "invitation.codeOptions.1": "尋找任何內測測試用戶邀請你。", "invitation.codeOptions.2": "加入我們的 Discord 伺服器，不定期贈送邀請碼。", "invitation.codeOptions.3": "關注我們的 X 帳戶，不定期贈送邀請碼。", - "invitation.earlyAccess": "Follow 目前處於早期訪問階段，使用需要邀請碼。", - "invitation.earlyAccessMessage": "😰 抱歉，Follow 目前處於早期訪問階段，使用需要邀請碼。", + "invitation.earlyAccess": "Folo 目前處於早期訪問階段，使用需要邀請碼。", + "invitation.earlyAccessMessage": "😰 抱歉，Folo 目前處於早期訪問階段，使用需要邀請碼。", "invitation.generateButton": "生成新邀請碼", "invitation.generateCost": "你可以花費 {{INVITATION_PRICE}} Power 為你的朋友生成邀請碼。", "invitation.getCodeMessage": "你可以通過以下方式獲取邀請碼：", @@ -42,13 +42,13 @@ "login.forget_password.label": "忘記密碼", "login.forget_password.note": "忘記密碼？", "login.forget_password.success": "電子郵件已成功發送", - "login.logInTo": "登錄到", - "login.logInWithEmail": "使用電子郵件登錄", + "login.logInTo": "登入到", + "login.logInWithEmail": "使用電子郵件登入", "login.new_password.label": "新密碼", - "login.openApp": "打開應用程式", + "login.openApp": "開啟應用程式", "login.or": "或", "login.password": "密碼", - "login.redirecting": "重定向中", + "login.redirecting": "重新導向中", "login.register": "註冊", "login.reset_password.description": "輸入新密碼並確認以重置密碼", "login.reset_password.label": "重置密碼", @@ -56,10 +56,11 @@ "login.signOut": "登出", "login.signUp": "使用電子郵件註冊", "login.submit": "提交", + "login.two_factor.code": "雙重驗證碼", "login.welcomeTo": "歡迎來到", "redirect.continueInBrowser": "在瀏覽器中繼續", - "redirect.instruction": "現在是時候打開 {{app_name}} 並安全地關閉此頁面。", - "redirect.openApp": "打開 {{app_name}}", + "redirect.instruction": "現在是時候開啟 {{app_name}} 並安全地關閉此頁面。", + "redirect.openApp": "開啟 {{app_name}}", "redirect.successMessage": "你已成功連接到 {{app_name}} 帳戶。", "register.confirm_password": "確認密碼", "register.email": "電子郵件", diff --git a/apps/desktop/locales/external/zh-TW.json b/apps/desktop/locales/external/zh-TW.json index 28ce81c4d5..ac771d6b55 100644 --- a/apps/desktop/locales/external/zh-TW.json +++ b/apps/desktop/locales/external/zh-TW.json @@ -27,8 +27,8 @@ "invitation.codeOptions.1": "尋找任何內部測試使用者邀請您。", "invitation.codeOptions.2": "加入我們的 Discord 伺服器，不定期贈送邀請碼。", "invitation.codeOptions.3": "關注我們的 X 帳號，不定期贈送邀請碼。", - "invitation.earlyAccess": "Follow 目前處於搶先體驗階段，需要邀請碼才能使用。", - "invitation.earlyAccessMessage": "😰 抱歉，Follow 目前處於搶先體驗階段，需要邀請碼才能使用。", + "invitation.earlyAccess": "Folo 目前處於搶先體驗階段，需要邀請碼才能使用。", + "invitation.earlyAccessMessage": "😰 抱歉，Folo 目前處於搶先體驗階段，需要邀請碼才能使用。", "invitation.generateButton": "產生新邀請碼", "invitation.generateCost": "您可以花費 {{INVITATION_PRICE}} Power 為您的朋友產生邀請碼。", "invitation.getCodeMessage": "您可以通過以下方式獲取邀請碼：", diff --git a/apps/desktop/locales/native/en.json b/apps/desktop/locales/native/en.json index 60bf7a6b1d..88bccdc328 100644 --- a/apps/desktop/locales/native/en.json +++ b/apps/desktop/locales/native/en.json @@ -39,7 +39,7 @@ "menu.discover": "Discover", "menu.edit": "Edit", "menu.file": "File", - "menu.followReleases": "Follow releases", + "menu.followReleases": "Folo releases", "menu.forceReload": "Force Reload", "menu.front": "Bring to Front", "menu.help": "Help", diff --git a/apps/desktop/locales/native/zh-HK.json b/apps/desktop/locales/native/zh-HK.json index 684b29a83f..ba44f39a12 100644 --- a/apps/desktop/locales/native/zh-HK.json +++ b/apps/desktop/locales/native/zh-HK.json @@ -2,59 +2,59 @@ "contextMenu.copy": "複製", "contextMenu.copyImage": "複製圖片", "contextMenu.copyImageAddress": "複製圖片地址", - "contextMenu.copyLink": "複製鏈接", - "contextMenu.copyVideoAddress": "複製視頻地址", + "contextMenu.copyLink": "複製連結", + "contextMenu.copyVideoAddress": "複製影片地址", "contextMenu.cut": "剪切", "contextMenu.inspect": "檢查元素", "contextMenu.learnSpelling": "學習拼寫", - "contextMenu.lookUpSelection": "查找選擇", - "contextMenu.openImageInBrowser": "在瀏覽器中打開圖片", - "contextMenu.openLinkInBrowser": "在瀏覽器中打開鏈接", - "contextMenu.paste": "粘貼", - "contextMenu.saveImage": "保存圖片", + "contextMenu.lookUpSelection": "查找選項", + "contextMenu.openImageInBrowser": "在瀏覽器中開啟圖片", + "contextMenu.openLinkInBrowser": "在瀏覽器中開啟連結", + "contextMenu.paste": "貼上", + "contextMenu.saveImage": "儲存圖片", "contextMenu.saveImageAs": "另存圖片為...", - "contextMenu.saveLinkAs": "另存鏈接為...", - "contextMenu.saveVideo": "保存視頻", - "contextMenu.saveVideoAs": "另存視頻為...", - "contextMenu.searchWithGoogle": "使用 Google 搜索", + "contextMenu.saveLinkAs": "另存連結為...", + "contextMenu.saveVideo": "儲存影片", + "contextMenu.saveVideoAs": "另存影片為...", + "contextMenu.searchWithGoogle": "使用 Google 搜尋", "contextMenu.selectAll": "全選", "contextMenu.services": "服務", "dialog.cancel": "取消", - "dialog.clearAllData": "您確定要清除所有數據嗎？", + "dialog.clearAllData": "您確定要清除所有資料嗎？", "dialog.no": "否", - "dialog.open": "打開", - "dialog.openExternalApp.message": "您確定要使用其他應用程序打開 \"{{url}}\" 嗎？", - "dialog.openExternalApp.title": "打開外部應用程序？", + "dialog.open": "開啟", + "dialog.openExternalApp.message": "您確定要使用其他應用程式開啟 \"{{url}}\" 嗎？", + "dialog.openExternalApp.title": "開啟外部應用程式？", "dialog.yes": "是", "menu.about": "關於 {{name}}", "menu.actualSize": "實際大小", - "menu.bringAllToFront": "將所有窗口移到最前面", + "menu.bringAllToFront": "將所有視窗移到最前面", "menu.checkForUpdates": "檢查更新", - "menu.clearAllData": "清除所有數據", + "menu.clearAllData": "清除所有資料", "menu.close": "關閉", "menu.copy": "複製", "menu.cut": "剪切", - "menu.debug": "調試", + "menu.debug": "除錯", "menu.delete": "刪除", "menu.discover": "發現", "menu.edit": "編輯", - "menu.file": "文件", + "menu.file": "檔案", "menu.followReleases": "關注更新", - "menu.forceReload": "強制重載", + "menu.forceReload": "強制重新載入", "menu.front": "移到最前面", "menu.help": "幫助", "menu.hide": "隱藏 {{name}}", - "menu.hideOthers": "隱藏其他窗口", + "menu.hideOthers": "隱藏其他視窗", "menu.minimize": "最小化", - "menu.open": "打開 {{name}}", - "menu.openLogFile": "打開日誌文件", - "menu.paste": "粘貼", - "menu.pasteAndMatchStyle": "粘貼並匹配樣式", + "menu.open": "開啟 {{name}}", + "menu.openLogFile": "開啟日誌檔案", + "menu.paste": "貼上", + "menu.pasteAndMatchStyle": "貼上並匹配樣式", "menu.quickAdd": "快速添加", - "menu.quit": "退出 {{name}}", - "menu.quitAndInstallUpdate": "調試：退出並安裝更新", + "menu.quit": "結束 {{name}}", + "menu.quitAndInstallUpdate": "除錯：結束並安裝更新", "menu.redo": "重做", - "menu.reload": "重載", + "menu.reload": "重新載入", "menu.search": "搜尋", "menu.selectAll": "全選", "menu.services": "服務", @@ -63,10 +63,10 @@ "menu.startSpeaking": "開始朗讀", "menu.stopSpeaking": "停止朗讀", "menu.toggleDevTools": "切換開發者工具", - "menu.toggleFullScreen": "切換全屏", + "menu.toggleFullScreen": "切換全螢幕", "menu.undo": "撤銷", - "menu.view": "查看", - "menu.window": "窗口", + "menu.view": "檢視", + "menu.window": "視窗", "menu.zenMode": "Zen 模式", "menu.zoom": "縮放", "menu.zoomIn": "放大", diff --git a/apps/desktop/locales/native/zh-TW.json b/apps/desktop/locales/native/zh-TW.json index b9346ad02d..659bb7d0ef 100644 --- a/apps/desktop/locales/native/zh-TW.json +++ b/apps/desktop/locales/native/zh-TW.json @@ -39,7 +39,7 @@ "menu.discover": "探索", "menu.edit": "編輯", "menu.file": "檔案", - "menu.followReleases": "Follow 發佈", + "menu.followReleases": "Folo 發佈", "menu.forceReload": "強制重新載入", "menu.front": "置於最上層", "menu.help": "說明", diff --git a/apps/desktop/locales/settings/ar-DZ.json b/apps/desktop/locales/settings/ar-DZ.json index c933272641..bad456b23a 100644 --- a/apps/desktop/locales/settings/ar-DZ.json +++ b/apps/desktop/locales/settings/ar-DZ.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "إعادة بناء قاعدة البيانات", "general.rebuild_database.warning.line1": "إعادة بناء قاعدة البيانات سيؤدي إلى مسح جميع بياناتك المحلية.", "general.rebuild_database.warning.line2": "هل أنت متأكد أنك تريد المتابعة؟", - "general.send_anonymous_data.description": "عن طريق اختيار إرسال بيانات مجهولة الهوية، تساهم في تحسين تجربة المستخدم العامة لـ Follow.", + "general.send_anonymous_data.description": "عن طريق اختيار إرسال بيانات مجهولة الهوية، تساهم في تحسين تجربة المستخدم العامة لـ Folo.", "general.send_anonymous_data.label": "إرسال بيانات مجهولة الهوية", "general.show_unread_on_launch.description": "عرض المحتوى غير المقروء عند التشغيل", "general.show_unread_on_launch.label": "عرض المحتوى غير المقروء عند التشغيل", @@ -120,8 +120,8 @@ "invitation.confirmModal.continue": "متابعة", "invitation.confirmModal.message": "إنشاء كود دعوة سيكلفك {{INVITATION_PRICE}} باور.", "invitation.confirmModal.title": "تأكيد", - "invitation.earlyAccess": "تطبيق Follow حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذرًا، Follow حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", + "invitation.earlyAccess": "تطبيق Folo حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذرًا، Folo حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", "invitation.generateButton": "إنشاء كود جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} باور لإنشاء كود دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على كود دعوة من خلال الطرق التالية:", @@ -161,7 +161,7 @@ "wallet.claim.tooltip.canClaim": "يمكنك الآن المطالبة بـ {{amount}} باور يوميًا!", "wallet.create.button": "إنشاء محفظة", "wallet.create.description": "أنشئ محفظة مجانية لتلقي باور، والذي يمكن استخدامه لمكافأة المبدعين وأيضًا الحصول على مكافآت لمساهماتك في المحتوى.", - "wallet.power.dailyClaim": "يمكنك المطالبة بـ {{amount}} باور مجاني يوميًا، والذي يمكن استخدامه لإعطاء إكراميات لمقالات RSS على Follow.", + "wallet.power.dailyClaim": "يمكنك المطالبة بـ {{amount}} باور مجاني يوميًا، والذي يمكن استخدامه لإعطاء إكراميات لمقالات RSS على Folo.", "wallet.sidebar_title": "باور", "wallet.transactions.amount": "المبلغ", "wallet.transactions.date": "التاريخ", diff --git a/apps/desktop/locales/settings/ar-IQ.json b/apps/desktop/locales/settings/ar-IQ.json index 37710aa2d2..97e22fc1b1 100644 --- a/apps/desktop/locales/settings/ar-IQ.json +++ b/apps/desktop/locales/settings/ar-IQ.json @@ -87,7 +87,7 @@ "general.rebuild_database.title": "إعادة بناء قاعدة البيانات", "general.rebuild_database.warning.line1": "إعادة بناء قاعدة البيانات سيؤدي إلى مسح جميع بياناتك المحلية.", "general.rebuild_database.warning.line2": "هل أنت متأكد أنك تريد المتابعة؟", - "general.send_anonymous_data.description": "عن طريق اختيار إرسال بيانات مجهولة الهوية، تساهم في تحسين تجربة المستخدم العامة لـ Follow.", + "general.send_anonymous_data.description": "عن طريق اختيار إرسال بيانات مجهولة الهوية، تساهم في تحسين تجربة المستخدم العامة لـ Folo.", "general.send_anonymous_data.label": "إرسال بيانات مجهولة الهوية", "general.show_unread_on_launch.description": "عرض المحتوى غير المقروء عند التشغيل", "general.show_unread_on_launch.label": "عرض المحتوى غير المقروء عند التشغيل", @@ -125,8 +125,8 @@ "invitation.confirmModal.continue": "متابعة", "invitation.confirmModal.message": "إنشاء كود دعوة سيكلفك {{INVITATION_PRICE}} باور.", "invitation.confirmModal.title": "تأكيد", - "invitation.earlyAccess": "تطبيق Follow حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذرًا، Follow حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", + "invitation.earlyAccess": "تطبيق Folo حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذرًا، Folo حاليًا في الوصول المبكر ويتطلب كود دعوة للاستخدام.", "invitation.generateButton": "إنشاء كود جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} باور لإنشاء كود دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على كود دعوة من خلال الطرق التالية:", @@ -168,7 +168,7 @@ "wallet.claim.tooltip.canClaim": "يمكنك الآن المطالبة بـ {{amount}} باور يوميًا!", "wallet.create.button": "إنشاء محفظة", "wallet.create.description": "أنشئ محفظة مجانية لتلقي باور، والذي يمكن استخدامه لمكافأة المبدعين وأيضًا الحصول على مكافآت لمساهماتك في المحتوى.", - "wallet.power.dailyClaim": "يمكنك المطالبة بـ {{amount}} باور مجاني يوميًا، والذي يمكن استخدامه لإعطاء إكراميات لمقالات RSS على Follow.", + "wallet.power.dailyClaim": "يمكنك المطالبة بـ {{amount}} باور مجاني يوميًا، والذي يمكن استخدامه لإعطاء إكراميات لمقالات RSS على Folo.", "wallet.sidebar_title": "باور", "wallet.transactions.amount": "المبلغ", "wallet.transactions.date": "التاريخ", diff --git a/apps/desktop/locales/settings/ar-KW.json b/apps/desktop/locales/settings/ar-KW.json index 74cea3af86..a04bf2bdbf 100644 --- a/apps/desktop/locales/settings/ar-KW.json +++ b/apps/desktop/locales/settings/ar-KW.json @@ -87,7 +87,7 @@ "general.rebuild_database.title": "إعادة بناء قاعدة البيانات", "general.rebuild_database.warning.line1": "إعادة بناء قاعدة البيانات ستؤدي إلى مسح جميع بياناتك المحلية.", "general.rebuild_database.warning.line2": "هل أنت متأكد أنك تريد المتابعة؟", - "general.send_anonymous_data.description": "عن طريق اختيار إرسال بيانات مجهولة الهوية، تساهم في تحسين تجربة المستخدم العامة لتطبيق Follow.", + "general.send_anonymous_data.description": "عن طريق اختيار إرسال بيانات مجهولة الهوية، تساهم في تحسين تجربة المستخدم العامة لتطبيق Folo.", "general.send_anonymous_data.label": "إرسال بيانات مجهولة الهوية", "general.show_unread_on_launch.description": "عرض المحتوى غير المقروء عند التشغيل", "general.show_unread_on_launch.label": "عرض المحتوى غير المقروء عند التشغيل", @@ -125,8 +125,8 @@ "invitation.confirmModal.continue": "استمرار", "invitation.confirmModal.message": "إنشاء رمز دعوة سيكلفك {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "تأكيد", - "invitation.earlyAccess": "تطبيق Follow في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذرًا، Follow حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccess": "تطبيق Folo في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذرًا، Folo حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} Power لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", @@ -168,7 +168,7 @@ "wallet.claim.tooltip.canClaim": "يمكنك الآن المطالبة بـ {{amount}} Power يوميًا!", "wallet.create.button": "إنشاء محفظة", "wallet.create.description": "أنشئ محفظة مجانية لتلقي Power، والذي يمكن استخدامه لمكافأة المبدعين والحصول أيضًا على مكافآت مقابل مساهماتك في المحتوى.", - "wallet.power.dailyClaim": "يمكنك المطالبة بـ {{amount}} Power مجانًا يوميًا، والذي يمكن استخدامه لإكراميات لمقالات RSS على Follow.", + "wallet.power.dailyClaim": "يمكنك المطالبة بـ {{amount}} Power مجانًا يوميًا، والذي يمكن استخدامه لإكراميات لمقالات RSS على Folo.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "المبلغ", "wallet.transactions.date": "التاريخ", diff --git a/apps/desktop/locales/settings/ar-MA.json b/apps/desktop/locales/settings/ar-MA.json index 1604037e5c..dbfaa3a34b 100644 --- a/apps/desktop/locales/settings/ar-MA.json +++ b/apps/desktop/locales/settings/ar-MA.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "إعادة بناء قاعدة البيانات", "general.rebuild_database.warning.line1": "إعادة بناء قاعدة البيانات غادي تمسح جميع بياناتك المحلية.", "general.rebuild_database.warning.line2": "واش متأكد بلي بغيتي تكمل؟", - "general.send_anonymous_data.description": "باختيار إرسال بيانات مجهولة، كتساهم ف تحسين تجربة المستخدم العامة ديال Follow.", + "general.send_anonymous_data.description": "باختيار إرسال بيانات مجهولة، كتساهم ف تحسين تجربة المستخدم العامة ديال Folo.", "general.send_anonymous_data.label": "إرسال بيانات مجهولة", "general.show_unread_on_launch.description": "عرض المحتوى الغير مقروء عند التشغيل", "general.show_unread_on_launch.label": "عرض المحتوى الغير مقروء عند التشغيل", @@ -120,8 +120,8 @@ "invitation.confirmModal.continue": "استمر", "invitation.confirmModal.message": "إنشاء كود الدعوة غادي يكلفك {{INVITATION_PRICE}} باور.", "invitation.confirmModal.title": "تأكيد", - "invitation.earlyAccess": "Follow حاليا في الوصول المبكر وخصك كود دعوة باش تستعملو.", - "invitation.earlyAccessMessage": "😰 آسف، Follow دابا في الوصول المبكر وخصك كود دعوة باش تستعملو.", + "invitation.earlyAccess": "Folo حاليا في الوصول المبكر وخصك كود دعوة باش تستعملو.", + "invitation.earlyAccessMessage": "😰 آسف، Folo دابا في الوصول المبكر وخصك كود دعوة باش تستعملو.", "invitation.generateButton": "إنشاء كود جديد", "invitation.generateCost": "تقدر تصرف {{INVITATION_PRICE}} باور باش تنشئ كود دعوة لأصدقائك.", "invitation.getCodeMessage": "تقدر تحصل على كود الدعوة بطرق التالية:", @@ -161,7 +161,7 @@ "wallet.claim.tooltip.canClaim": "تقدر تطالب دابا ب {{amount}} باور يومي!", "wallet.create.button": "إنشاء محفظة", "wallet.create.description": "صاوب محفظة مجانية باش تلقى باور اللي ممكن تستعملو باش تكافئ المبدعين، أو حتى تتكافئ على المساهمات ديالك.", - "wallet.power.dailyClaim": "يمكن ليك تطالب ب {{amount}} باور مجاني يومي، اللي ممكن تستعملو باش تقدم إكراميات لمقالات RSS على Follow.", + "wallet.power.dailyClaim": "يمكن ليك تطالب ب {{amount}} باور مجاني يومي، اللي ممكن تستعملو باش تقدم إكراميات لمقالات RSS على Folo.", "wallet.sidebar_title": "باور", "wallet.transactions.amount": "المبلغ", "wallet.transactions.date": "التاريخ", diff --git a/apps/desktop/locales/settings/ar-SA.json b/apps/desktop/locales/settings/ar-SA.json index c5dc5b7127..1c5efe5952 100644 --- a/apps/desktop/locales/settings/ar-SA.json +++ b/apps/desktop/locales/settings/ar-SA.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "إعادة بناء قاعدة البيانات", "general.rebuild_database.warning.line1": "إعادة بناء قاعدة البيانات سيؤدي إلى مسح جميع بياناتك المحلية.", "general.rebuild_database.warning.line2": "هل أنت متأكد من أنك تريد المتابعة؟", - "general.send_anonymous_data.description": "بإرسال بيانات التتبع المجهولة، تساهم في تحسين تجربة المستخدم العامة لـ Follow.", + "general.send_anonymous_data.description": "بإرسال بيانات التتبع المجهولة، تساهم في تحسين تجربة المستخدم العامة لـ Folo.", "general.send_anonymous_data.label": "إرسال البيانات مجهولة المصدر", "general.show_unread_on_launch.description": "عرض المحتوى غير المقروء عند التشغيل", "general.show_unread_on_launch.label": "عرض المحتوى غير المقروء عند التشغيل", @@ -115,8 +115,8 @@ "invitation.confirmModal.continue": "استمر", "invitation.confirmModal.message": "سيكلفك إنشاء رمز دعوة {{INVITATION_PRICE}} من الطاقة.", "invitation.confirmModal.title": "تأكيد", - "invitation.earlyAccess": "Follow حاليًا في الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", - "invitation.earlyAccessMessage": "😰 آسف، Follow حاليًا في الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", + "invitation.earlyAccess": "Folo حاليًا في الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", + "invitation.earlyAccessMessage": "😰 آسف، Folo حاليًا في الوصول المبكر ويتطلب رمز دعوة لاستخدامه.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} من الطاقة لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", @@ -156,7 +156,7 @@ "wallet.claim.tooltip.canClaim": "احصل على {{amount}} من الطاقة اليومية الآن!", "wallet.create.button": "إنشاء محفظة", "wallet.create.description": "قم بإنشاء محفظة مجانية لتلقي الطاقة، التي يمكن استخدامها لمكافأة المبدعين وأيضًا الحصول على مكافآت لمساهماتك في المحتوى.", - "wallet.power.dailyClaim": "يمكنك الحصول على {{amount}} من الطاقة المجانية يوميًا، التي يمكن استخدامها لإكراميات لمقالات RSS على Follow.", + "wallet.power.dailyClaim": "يمكنك الحصول على {{amount}} من الطاقة المجانية يوميًا، التي يمكن استخدامها لإكراميات لمقالات RSS على Folo.", "wallet.sidebar_title": "الطاقة", "wallet.transactions.amount": "المبلغ", "wallet.transactions.date": "التاريخ", diff --git a/apps/desktop/locales/settings/ar-TN.json b/apps/desktop/locales/settings/ar-TN.json index fc9ef1710a..5e5d2198e3 100644 --- a/apps/desktop/locales/settings/ar-TN.json +++ b/apps/desktop/locales/settings/ar-TN.json @@ -87,7 +87,7 @@ "general.rebuild_database.title": "إعادة بناء قاعدة البيانات", "general.rebuild_database.warning.line1": "ستؤدي إعادة بناء قاعدة البيانات إلى مسح جميع بياناتك المحلية.", "general.rebuild_database.warning.line2": "هل أنت متأكد أنك تريد المتابعة؟", - "general.send_anonymous_data.description": "من خلال اختيار إرسال بيانات عن بعد مجهولة، فإنك تساهم في تحسين تجربة المستخدم العامة لـ Follow.", + "general.send_anonymous_data.description": "من خلال اختيار إرسال بيانات عن بعد مجهولة، فإنك تساهم في تحسين تجربة المستخدم العامة لـ Folo.", "general.send_anonymous_data.label": "إرسال بيانات مجهولة", "general.show_unread_on_launch.description": "عرض المحتوى غير المقروء عند الإطلاق", "general.show_unread_on_launch.label": "عرض المحتوى غير المقروء عند الإطلاق", @@ -120,8 +120,8 @@ "invitation.confirmModal.continue": "متابعة", "invitation.confirmModal.message": "سيكلفك إنشاء رمز دعوة {{INVITATION_PRICE}} من Power.", "invitation.confirmModal.title": "تأكيد", - "invitation.earlyAccess": "Follow حاليًا في الوصول المبكر ويتطلب رمز دعوة للاستخدام.", - "invitation.earlyAccessMessage": "😰 عذرًا، Follow حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccess": "Folo حاليًا في الوصول المبكر ويتطلب رمز دعوة للاستخدام.", + "invitation.earlyAccessMessage": "😰 عذرًا، Folo حاليًا في مرحلة الوصول المبكر ويتطلب رمز دعوة للاستخدام.", "invitation.generateButton": "إنشاء رمز جديد", "invitation.generateCost": "يمكنك إنفاق {{INVITATION_PRICE}} من Power لإنشاء رمز دعوة لأصدقائك.", "invitation.getCodeMessage": "يمكنك الحصول على رمز دعوة من خلال الطرق التالية:", @@ -163,7 +163,7 @@ "wallet.claim.tooltip.canClaim": "استلم {{amount}} من الطاقة اليومية الآن!", "wallet.create.button": "إنشاء محفظة", "wallet.create.description": "أنشئ محفظة مجانية لاستلام Power، والتي يمكن استخدامها لمكافأة المبدعين وأيضًا الحصول على مكافآت مقابل مساهماتك في المحتوى.", - "wallet.power.dailyClaim": "يمكنك استلام {{amount}} من الطاقة المجانية يوميًا، والتي يمكن استخدامها لإكراميات عناصر RSS على Follow.", + "wallet.power.dailyClaim": "يمكنك استلام {{amount}} من الطاقة المجانية يوميًا، والتي يمكن استخدامها لإكراميات عناصر RSS على Folo.", "wallet.sidebar_title": "الطاقة", "wallet.transactions.amount": "المبلغ", "wallet.transactions.date": "التاريخ", diff --git a/apps/desktop/locales/settings/de.json b/apps/desktop/locales/settings/de.json index 8939cfb106..1e03c2154d 100644 --- a/apps/desktop/locales/settings/de.json +++ b/apps/desktop/locales/settings/de.json @@ -93,7 +93,7 @@ "general.rebuild_database.title": "Datenbank neu aufbauen", "general.rebuild_database.warning.line1": "Das Neuaufbauen der Datenbank löscht alle Ihre lokalen Daten.", "general.rebuild_database.warning.line2": "Sind Sie sicher, dass Sie fortfahren möchten?", - "general.send_anonymous_data.description": "Wenn Sie sich für das Senden anonymisierter Telemetriedaten entscheiden, tragen Sie zur Verbesserung der Benutzererfahrung von Follow bei.", + "general.send_anonymous_data.description": "Wenn Sie sich für das Senden anonymisierter Telemetriedaten entscheiden, tragen Sie zur Verbesserung der Benutzererfahrung von Folo bei.", "general.send_anonymous_data.label": "Anonyme Daten senden", "general.show_unread_on_launch.description": "Ungelesene Inhalte beim Start anzeigen", "general.show_unread_on_launch.label": "Ungelesene Inhalte beim Start anzeigen", @@ -131,8 +131,8 @@ "invitation.confirmModal.continue": "Fortfahren", "invitation.confirmModal.message": "Das Generieren eines Einladungscodes kostet Sie {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "Bestätigen", - "invitation.earlyAccess": "Follow befindet sich derzeit im Early Access und erfordert einen Einladungscode zur Nutzung.", - "invitation.earlyAccessMessage": "😰 Entschuldigung, Follow befindet sich derzeit im Early Access und erfordert einen Einladungscode zur Nutzung.", + "invitation.earlyAccess": "Folo befindet sich derzeit im Early Access und erfordert einen Einladungscode zur Nutzung.", + "invitation.earlyAccessMessage": "😰 Entschuldigung, Folo befindet sich derzeit im Early Access und erfordert einen Einladungscode zur Nutzung.", "invitation.generateButton": "Neuen Code generieren", "invitation.generateCost": "Sie können {{INVITATION_PRICE}} Power ausgeben, um einen Einladungscode für Ihre Freunde zu generieren.", "invitation.getCodeMessage": "Sie können einen Einladungscode auf folgende Weise erhalten:", @@ -202,7 +202,7 @@ "wallet.claim.tooltip.canClaim": "Beanspruchen Sie jetzt Ihre {{amount}} tägliche Power!", "wallet.create.button": "Wallet erstellen", "wallet.create.description": "Erstellen Sie eine kostenlose Wallet, um Power zu erhalten, die verwendet werden kann, um Ersteller zu belohnen und auch für Ihre Inhaltsbeiträge belohnt zu werden.", - "wallet.power.dailyClaim": "Sie können täglich {{amount}} kostenlose Power beanspruchen, die verwendet werden kann, um RSS-Einträge auf Follow zu belohnen.", + "wallet.power.dailyClaim": "Sie können täglich {{amount}} kostenlose Power beanspruchen, die verwendet werden kann, um RSS-Einträge auf Folo zu belohnen.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Betrag", "wallet.transactions.date": "Datum", diff --git a/apps/desktop/locales/settings/en.json b/apps/desktop/locales/settings/en.json index c5e312d214..6ebe5e85d3 100644 --- a/apps/desktop/locales/settings/en.json +++ b/apps/desktop/locales/settings/en.json @@ -175,7 +175,7 @@ "general.rebuild_database.title": "Rebuild Database", "general.rebuild_database.warning.line1": "Rebuilding the database will clear all your local data.", "general.rebuild_database.warning.line2": "Are you sure you want to continue?", - "general.send_anonymous_data.description": "By opting to send anonymized telemetry data, you contribute to improving the overall user experience of Follow.", + "general.send_anonymous_data.description": "By opting to send anonymized telemetry data, you contribute to improving the overall user experience of Folo.", "general.send_anonymous_data.label": "Send anonymous data", "general.show_quick_timeline.description": "Show the quick timeline at the top of the feed list.", "general.show_quick_timeline.label": "Show feed list timeline", @@ -187,7 +187,9 @@ "general.startup_screen.timeline": "Timeline", "general.startup_screen.title": "Startup Screen", "general.timeline": "Timeline", - "general.translation_language": "Translation Language", + "general.action_language.label": "Action Language", + "general.action_language.default": "Default (UI Language)", + "general.action_language.description": "The language used for translation and summary", "general.unread": "Unread", "general.voices": "Voices", "integration.eagle.enable.description": "Display 'Save media to Eagle' button when available.", @@ -236,8 +238,8 @@ "invitation.confirmModal.continue": "Continue", "invitation.confirmModal.message": "Generating an invitation code will cost you {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "Confirm", - "invitation.earlyAccess": "Follow is currently in early access and requires an invitation code to use.", - "invitation.earlyAccessMessage": "😰 Sorry, Follow is currently in early access and requires an invitation code to use.", + "invitation.earlyAccess": "Folo is currently in early access and requires an invitation code to use.", + "invitation.earlyAccessMessage": "😰 Sorry, Folo is currently in early access and requires an invitation code to use.", "invitation.generateButton": "Generate new code", "invitation.generateCost": "You can spend {{INVITATION_PRICE}} Power to generate an invitation code for your friends.", "invitation.getCodeMessage": "You can get an invitation code through the following methods:", @@ -295,6 +297,7 @@ "profile.email.unverified": "Unverified", "profile.email.verification_sent": "Email verification sent", "profile.email.verified": "Verified", + "profile.email.verify_email": "Please verify your email ({{email_address}}) to continue", "profile.handle.description": "Your unique identifier.", "profile.handle.label": "Handle", "profile.link_social.authentication": "Authentication", @@ -326,9 +329,9 @@ "rsshub.addModal.access_key_label": "Access Key (Optional)", "rsshub.addModal.add": "Add", "rsshub.addModal.base_url_label": "Base URL", - "rsshub.addModal.description": "To use your own instance in Follow, you must add the following environment variables to it.", + "rsshub.addModal.description": "To use your own instance in Folo, you must add the following environment variables to it.", "rsshub.add_new_instance": "Add New Instance", - "rsshub.description": "RSSHub is a community-driven open-source RSS network. Follow provides a built-in dedicated instance and uses it to support thousands of subscription contents, you can also achieve more stable content acquisition by using your own or third-party instances.", + "rsshub.description": "RSSHub is a community-driven open-source RSS network. Folo provides a built-in dedicated instance and uses it to support thousands of subscription contents, you can also achieve more stable content acquisition by using your own or third-party instances.", "rsshub.public_instances": "Available Instances", "rsshub.table.description": "Description", "rsshub.table.edit": "Edit", @@ -372,9 +375,9 @@ "wallet.claim.tooltip.canClaim": "Claim your {{amount}} Daily Power now!", "wallet.create.button": "Create Wallet", "wallet.create.description": "Create a free wallet to receive Power, which can be used to reward creators and also get rewarded for your content contributions.", - "wallet.power.dailyClaim": "You can claim {{amount}} free Power daily, which can be used to tip RSS entries on Follow.", - "wallet.power.description2": "Power is an ERC-20 token on the {{blockchainName}} blockchain, which can be used for purchases and tipping on Follow.", - "wallet.power.rewardDescription": "All active users on Follow are eligible for daily power rewards.", + "wallet.power.dailyClaim": "You can claim {{amount}} free Power daily, which can be used to tip RSS entries on Folo.", + "wallet.power.description2": "Power is an ERC-20 token on the {{blockchainName}} blockchain, which can be used for purchases and tipping on Folo.", + "wallet.power.rewardDescription": "All active users on Folo are eligible for daily power rewards.", "wallet.power.rewardDescription2": "Based on your level and past activities, you can receive a reward today. Learn more.", "wallet.ranking.level": "Level", "wallet.ranking.name": "Name", @@ -383,7 +386,7 @@ "wallet.ranking.title": "Power Ranking", "wallet.rewardDescription.description1": "The daily rewards for each user are based on two factors: user level and user activity points.", "wallet.rewardDescription.description2": "User level: Determined by the user's Power ranking compared to all other users.", - "wallet.rewardDescription.description3": "User Activity: Engaging with various Follow features can boost activity. Rewards range from a minimum of 1x to a maximum of 5x.", + "wallet.rewardDescription.description3": "User Activity: Engaging with various Folo features can boost activity. Rewards range from a minimum of 1x to a maximum of 5x.", "wallet.rewardDescription.level": "User Level", "wallet.rewardDescription.percentage": "Ranking Percentage", "wallet.rewardDescription.reward": "Reward Multiplier", @@ -392,7 +395,7 @@ "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Amount", "wallet.transactions.date": "Date", - "wallet.transactions.description": "Certain transactions incur a {{percentage}}% platform fee to support Follow go further. For details, please refer to the blockchain transaction.", + "wallet.transactions.description": "Certain transactions incur a {{percentage}}% platform fee to support Folo go further. For details, please refer to the blockchain transaction.", "wallet.transactions.from": "From", "wallet.transactions.more": "View more through the blockchain explorer.", "wallet.transactions.noTransactions": "No transactions", diff --git a/apps/desktop/locales/settings/es.json b/apps/desktop/locales/settings/es.json index 22b4b65014..b2dcb39d14 100644 --- a/apps/desktop/locales/settings/es.json +++ b/apps/desktop/locales/settings/es.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "Reconstruir Base de Datos", "general.rebuild_database.warning.line1": "Reconstruir la base de datos borrará todos tus datos locales.", "general.rebuild_database.warning.line2": "¿Estás seguro de que deseas continuar?", - "general.send_anonymous_data.description": "Al optar por enviar datos de telemetría anónimos, contribuyes a mejorar la experiencia general de usuario de Follow.", + "general.send_anonymous_data.description": "Al optar por enviar datos de telemetría anónimos, contribuyes a mejorar la experiencia general de usuario de Folo.", "general.send_anonymous_data.label": "Enviar datos anónimos", "general.show_unread_on_launch.description": "Mostrar contenido no leído al iniciar", "general.show_unread_on_launch.label": "Mostrar contenido no leído al iniciar", @@ -120,8 +120,8 @@ "invitation.confirmModal.continue": "Continuar", "invitation.confirmModal.message": "Generar un código de invitación te costará {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "Confirmar", - "invitation.earlyAccess": "Follow está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", - "invitation.earlyAccessMessage": "😰 Lo sentimos, Follow está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", + "invitation.earlyAccess": "Folo está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", + "invitation.earlyAccessMessage": "😰 Lo sentimos, Folo está actualmente en acceso anticipado y requiere un código de invitación para usarlo.", "invitation.generateButton": "Generar nuevo código", "invitation.generateCost": "Puedes gastar {{INVITATION_PRICE}} Power para generar un código de invitación para tus amigos.", "invitation.getCodeMessage": "Puedes obtener un código de invitación a través de los siguientes métodos:", @@ -161,7 +161,7 @@ "wallet.claim.tooltip.canClaim": "¡Reclama tus {{amount}} Power diarios ahora!", "wallet.create.button": "Crear Cartera", "wallet.create.description": "Crea una cartera gratuita para recibir Power, que puede ser usado para recompensar a los creadores y también ser recompensado por tus contribuciones de contenido.", - "wallet.power.dailyClaim": "Puedes reclamar {{amount}} Power gratis diariamente, que puede ser usado para dar propinas a entradas RSS en Follow.", + "wallet.power.dailyClaim": "Puedes reclamar {{amount}} Power gratis diariamente, que puede ser usado para dar propinas a entradas RSS en Folo.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Cantidad", "wallet.transactions.date": "Fecha", diff --git a/apps/desktop/locales/settings/fi.json b/apps/desktop/locales/settings/fi.json index bfad6cc5f8..2295bfa40a 100644 --- a/apps/desktop/locales/settings/fi.json +++ b/apps/desktop/locales/settings/fi.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "Rakenna tietokanta uudelleen", "general.rebuild_database.warning.line1": "Tietokannan uudelleenrakentaminen tyhjentää kaikki paikalliset tietosi.", "general.rebuild_database.warning.line2": "Haluatko varmasti jatkaa?", - "general.send_anonymous_data.description": "Valitsemalla anonyymien telemetriatietojen lähettämisen autat parantamaan Follow'n yleistä käyttäjäkokemusta.", + "general.send_anonymous_data.description": "Valitsemalla anonyymien telemetriatietojen lähettämisen autat parantamaan Folo'n yleistä käyttäjäkokemusta.", "general.send_anonymous_data.label": "Lähetä anonyymejä tietoja", "general.show_unread_on_launch.description": "Näytä lukematon sisältö käynnistyksessä", "general.show_unread_on_launch.label": "Näytä lukematon sisältö käynnistyksessä", @@ -115,8 +115,8 @@ "invitation.confirmModal.continue": "Jatka", "invitation.confirmModal.message": "Kutsukoodin luominen maksaa sinulle {{INVITATION_PRICE}} Poweria.", "invitation.confirmModal.title": "Vahvista", - "invitation.earlyAccess": "Follow on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", - "invitation.earlyAccessMessage": "😰 Pahoittelut, Follow on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", + "invitation.earlyAccess": "Folo on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", + "invitation.earlyAccessMessage": "😰 Pahoittelut, Folo on tällä hetkellä varhaisessa käytössä ja vaatii kutsukoodin.", "invitation.generateButton": "Luo uusi koodi", "invitation.generateCost": "Voit käyttää {{INVITATION_PRICE}} Poweria luodaksesi kutsukoodin ystävillesi.", "invitation.getCodeMessage": "Voit saada kutsukoodin seuraavilla tavoilla:", @@ -156,7 +156,7 @@ "wallet.claim.tooltip.canClaim": "Vahvista {{amount}} päivittäinen Powerisi nyt!", "wallet.create.button": "Luo lompakko", "wallet.create.description": "Luo ilmainen lompakko vastaanottaaksesi Poweria, jota voit käyttää palkitaksesi tekijöitä ja saadaksesi palkintoja sisällön tuottamisesta.", - "wallet.power.dailyClaim": "Voit vahvistaa {{amount}} ilmaista Poweria päivittäin, jota voit käyttää tipataksesi RSS-merkintöjä Follow'ssa.", + "wallet.power.dailyClaim": "Voit vahvistaa {{amount}} ilmaista Poweria päivittäin, jota voit käyttää tipataksesi RSS-merkintöjä Folo'ssa.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Määrä", "wallet.transactions.date": "Päivämäärä", diff --git a/apps/desktop/locales/settings/fr.json b/apps/desktop/locales/settings/fr.json index ee07aa5ca1..604bd04093 100644 --- a/apps/desktop/locales/settings/fr.json +++ b/apps/desktop/locales/settings/fr.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "Reconstruire la base de données", "general.rebuild_database.warning.line1": "La reconstruction de la base de données effacera toutes vos données locales.", "general.rebuild_database.warning.line2": "Êtes-vous sûr de vouloir continuer ?", - "general.send_anonymous_data.description": "En choisissant d'envoyer des données anonymisées, vous contribuez à améliorer l'expérience utilisateur globale de Follow.", + "general.send_anonymous_data.description": "En choisissant d'envoyer des données anonymisées, vous contribuez à améliorer l'expérience utilisateur globale de Folo.", "general.send_anonymous_data.label": "Envoyer des données anonymes", "general.show_unread_on_launch.description": "Afficher le contenu non lu au lancement", "general.show_unread_on_launch.label": "Afficher le contenu non lu au lancement", @@ -115,8 +115,8 @@ "invitation.confirmModal.continue": "Continuer", "invitation.confirmModal.message": "Générer un code d'invitation vous coûtera {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "Confirmer", - "invitation.earlyAccess": "Follow est actuellement en accès anticipé et nécessite un code d'invitation pour l'utiliser.", - "invitation.earlyAccessMessage": "😰 Désolé, Follow est actuellement en accès anticipé et nécessite un code d'invitation pour l'utiliser.", + "invitation.earlyAccess": "Folo est actuellement en accès anticipé et nécessite un code d'invitation pour l'utiliser.", + "invitation.earlyAccessMessage": "😰 Désolé, Folo est actuellement en accès anticipé et nécessite un code d'invitation pour l'utiliser.", "invitation.generateButton": "Générer un nouveau code", "invitation.generateCost": "Vous pouvez dépenser {{INVITATION_PRICE}} Power pour générer un code d'invitation pour vos amis.", "invitation.getCodeMessage": "Vous pouvez obtenir un code d'invitation par les moyens suivants :", @@ -156,7 +156,7 @@ "wallet.claim.tooltip.canClaim": "Réclamez votre {{amount}} Power quotidien maintenant !", "wallet.create.button": "Créer un portefeuille", "wallet.create.description": "Créez un portefeuille gratuit pour recevoir Power, qui peut être utilisé pour récompenser les créateurs et aussi pour recevoir des récompenses pour vos contributions au contenu.", - "wallet.power.dailyClaim": "Vous pouvez réclamer {{amount}} Power gratuit quotidiennement, qui peut être utilisé pour donner des pourboires aux entrées RSS sur Follow.", + "wallet.power.dailyClaim": "Vous pouvez réclamer {{amount}} Power gratuit quotidiennement, qui peut être utilisé pour donner des pourboires aux entrées RSS sur Folo.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Montant", "wallet.transactions.date": "Date", diff --git a/apps/desktop/locales/settings/it.json b/apps/desktop/locales/settings/it.json index 6323b3b35d..c201ba765c 100644 --- a/apps/desktop/locales/settings/it.json +++ b/apps/desktop/locales/settings/it.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "Ricostruisci Database", "general.rebuild_database.warning.line1": "La ricostruzione del database cancellerà tutti i tuoi dati locali.", "general.rebuild_database.warning.line2": "Sei sicuro di voler continuare?", - "general.send_anonymous_data.description": "Optando per inviare dati di telemetria anonimi, contribuisci a migliorare l'esperienza utente generale di Follow.", + "general.send_anonymous_data.description": "Optando per inviare dati di telemetria anonimi, contribuisci a migliorare l'esperienza utente generale di Folo.", "general.send_anonymous_data.label": "Invia dati anonimi", "general.show_unread_on_launch.description": "Mostra contenuti non letti all'avvio", "general.show_unread_on_launch.label": "Mostra contenuti non letti all'avvio", @@ -115,8 +115,8 @@ "invitation.confirmModal.continue": "Continua", "invitation.confirmModal.message": "Generare un codice di invito ti costerà {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "Conferma", - "invitation.earlyAccess": "Follow è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", - "invitation.earlyAccessMessage": "😰 Ci dispiace, Follow è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", + "invitation.earlyAccess": "Folo è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", + "invitation.earlyAccessMessage": "😰 Ci dispiace, Folo è attualmente in accesso anticipato e richiede un codice di invito per essere utilizzato.", "invitation.generateButton": "Genera nuovo codice", "invitation.generateCost": "Puoi spendere {{INVITATION_PRICE}} Power per generare un codice di invito per i tuoi amici.", "invitation.getCodeMessage": "Puoi ottenere un codice di invito nei seguenti modi:", @@ -156,7 +156,7 @@ "wallet.claim.tooltip.canClaim": "Richiedi ora i tuoi {{amount}} Power giornalieri!", "wallet.create.button": "Crea Wallet", "wallet.create.description": "Crea un wallet gratuito per ricevere Power, che può essere utilizzato per ricompensare i creatori e ottenere ricompense per i tuoi contributi di contenuti.", - "wallet.power.dailyClaim": "Puoi richiedere {{amount}} Power gratuiti ogni giorno, che possono essere usati per dare mance agli RSS su Follow.", + "wallet.power.dailyClaim": "Puoi richiedere {{amount}} Power gratuiti ogni giorno, che possono essere usati per dare mance agli RSS su Folo.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Importo", "wallet.transactions.date": "Data", diff --git a/apps/desktop/locales/settings/ja.json b/apps/desktop/locales/settings/ja.json index 11a9fb1e45..f991c861be 100644 --- a/apps/desktop/locales/settings/ja.json +++ b/apps/desktop/locales/settings/ja.json @@ -155,7 +155,7 @@ "general.rebuild_database.title": "データベースを再構築", "general.rebuild_database.warning.line1": "データベースの再構築により、すべてのローカルデータが消去されます。", "general.rebuild_database.warning.line2": "本当に続行しますか？", - "general.send_anonymous_data.description": "匿名化されたテレメトリーデータを送信することにより、Follow の全体的なユーザーエクスペリエンスの向上に貢献します。", + "general.send_anonymous_data.description": "匿名化されたテレメトリーデータを送信することにより、Folo の全体的なユーザーエクスペリエンスの向上に貢献します。", "general.send_anonymous_data.label": "匿名データを送信", "general.show_quick_timeline.description": "フィードリストの最上部にクイックタイムラインを表示する", "general.show_quick_timeline.label": "フィードリストにタイムラインを表示する", @@ -167,7 +167,6 @@ "general.startup_screen.timeline": "タイムライン", "general.startup_screen.title": "スタートアップスクリーン", "general.timeline": "タイムライン", - "general.translation_language": "翻訳する言語", "general.unread": "未読", "general.voices": "音声", "integration.eagle.enable.description": "利用可能な場合、'Eagle にメディアを保存' ボタンを表示します。", @@ -216,8 +215,8 @@ "invitation.confirmModal.continue": "続行", "invitation.confirmModal.message": "招待コードを生成するには、{{INVITATION_PRICE}} Power が必要です。", "invitation.confirmModal.title": "確認", - "invitation.earlyAccess": "現在、Follow はアーリーアクセス中で、招待コードが必要です。", - "invitation.earlyAccessMessage": "😰 申し訳ありません。Follow は現在アーリーアクセス中で、招待コードが必要です。", + "invitation.earlyAccess": "現在、Folo はアーリーアクセス中で、招待コードが必要です。", + "invitation.earlyAccessMessage": "😰 申し訳ありません。Folo は現在アーリーアクセス中で、招待コードが必要です。", "invitation.generateButton": "新しいコードを生成", "invitation.generateCost": "{{INVITATION_PRICE}} Power を消費して、友達のために招待コードを生成できます。", "invitation.getCodeMessage": "以下の方法で招待コードを取得できます：", @@ -306,9 +305,9 @@ "rsshub.addModal.access_key_label": "アクセスキー (オプション)", "rsshub.addModal.add": "追加", "rsshub.addModal.base_url_label": "Base URL", - "rsshub.addModal.description": "Follow であなた所有のインスタンスを使うには、以下の環境変数を追加する必要があります。", + "rsshub.addModal.description": "Folo であなた所有のインスタンスを使うには、以下の環境変数を追加する必要があります。", "rsshub.add_new_instance": "新たなインスタンスを追加", - "rsshub.description": "RSSHub コミュニティ駆動のオープンソース RSS ネットワークです。Follow は内蔵の専用インスタンスを提供し、そのインスタンスを使って数千のサブスクリプションコンテンツをサポートします。また独自あるいはサードパーティのインスタンスを使用することで、より安定したコンテンツ取得を実現できます。", + "rsshub.description": "RSSHub コミュニティ駆動のオープンソース RSS ネットワークです。Folo は内蔵の専用インスタンスを提供し、そのインスタンスを使って数千のサブスクリプションコンテンツをサポートします。また独自あるいはサードパーティのインスタンスを使用することで、より安定したコンテンツ取得を実現できます。", "rsshub.public_instances": "利用可能なインスタンス", "rsshub.table.description": "説明", "rsshub.table.edit": "編集", @@ -351,9 +350,9 @@ "wallet.claim.tooltip.canClaim": "{{amount}} のデイリー Power を今すぐ取得しましょう！", "wallet.create.button": "ウォレットを作成", "wallet.create.description": " Powerを受け取るための無料ウォレットを作成し、クリエイターに報酬を与えたり、コンテンツ貢献で報酬を得ることができます。", - "wallet.power.dailyClaim": "毎日 {{amount}} の無料 Power を取得でき、それを使って Follow の RSS エントリにチップを送ることができます。", - "wallet.power.description2": "Power はブロックチェーン {{blockchainName}} 上にある ERC-20 トークン で、Follow 内でのチップや購入に使用できます。", - "wallet.power.rewardDescription": "Follow のすべてのアクティブ ユーザーは、デイリー Power 特典の対象となります。", + "wallet.power.dailyClaim": "毎日 {{amount}} の無料 Power を取得でき、それを使って Folo の RSS エントリにチップを送ることができます。", + "wallet.power.description2": "Power はブロックチェーン {{blockchainName}} 上にある ERC-20 トークン で、Folo 内でのチップや購入に使用できます。", + "wallet.power.rewardDescription": "Folo のすべてのアクティブ ユーザーは、デイリー Power 特典の対象となります。", "wallet.power.rewardDescription2": "あなたのレベルや日々のアクティビティによって が本日の報酬として提供されます。さらなる情報はこちら", "wallet.ranking.level": "レベル", "wallet.ranking.name": "名前", @@ -362,7 +361,7 @@ "wallet.ranking.title": "Power ランキング", "wallet.rewardDescription.description1": "各ユーザーの毎日の報酬はユーザー レベルとユーザー アクティビティ ポイントの2つの要素に基づいています。", "wallet.rewardDescription.description2": "ユーザー レベル: 他のすべてのユーザーと比較したユーザーの Power ランキングによって決定されます。", - "wallet.rewardDescription.description3": "ユーザーのアクティビティ: 様々な Follow 機能に参加することでアクティビティを高めることができます。報酬は最低1倍から最高10倍まで。", + "wallet.rewardDescription.description3": "ユーザーのアクティビティ: 様々な Folo 機能に参加することでアクティビティを高めることができます。報酬は最低1倍から最高10倍まで。", "wallet.rewardDescription.level": "ユーザー レベル", "wallet.rewardDescription.percentage": "ランキングの割合", "wallet.rewardDescription.reward": "報酬の割合", @@ -371,7 +370,7 @@ "wallet.sidebar_title": "Power", "wallet.transactions.amount": "金額", "wallet.transactions.date": "日付", - "wallet.transactions.description": "一部の取引では、Follow のさらなる発展をサポートするため、{{percentage}}%のプラットフォーム手数料が発生します。詳細についてはブロックチェーン取引を参照してください。", + "wallet.transactions.description": "一部の取引では、Folo のさらなる発展をサポートするため、{{percentage}}%のプラットフォーム手数料が発生します。詳細についてはブロックチェーン取引を参照してください。", "wallet.transactions.from": "送信元", "wallet.transactions.more": "blockchain explorerで詳細を表示する", "wallet.transactions.noTransactions": "トランザクションなし", diff --git a/apps/desktop/locales/settings/ko.json b/apps/desktop/locales/settings/ko.json index e41020236b..a216d3a779 100644 --- a/apps/desktop/locales/settings/ko.json +++ b/apps/desktop/locales/settings/ko.json @@ -160,7 +160,7 @@ "general.rebuild_database.title": "데이터베이스 재구축", "general.rebuild_database.warning.line1": "데이터베이스를 재구축하면 모든 로컬 데이터가 삭제됩니다.", "general.rebuild_database.warning.line2": "계속하시겠습니까?", - "general.send_anonymous_data.description": "익명화된 텔레메트리 데이터를 전송하는 것을 선택하면 Follow 의 전반적인 사용자 경험을 향상시키는 데 기여하게 됩니다.", + "general.send_anonymous_data.description": "익명화된 텔레메트리 데이터를 전송하는 것을 선택하면 Folo 의 전반적인 사용자 경험을 향상시키는 데 기여하게 됩니다.", "general.send_anonymous_data.label": "익명 데이터 전송", "general.show_quick_timeline.description": "피드 목록 상단에 빠른 타임라인을 표시합니다.", "general.show_quick_timeline.label": "피드 목록 타임라인 표시", @@ -172,7 +172,6 @@ "general.startup_screen.timeline": "타임라인", "general.startup_screen.title": "시작 화면", "general.timeline": "타임라인", - "general.translation_language": "번역 언어", "general.unread": "읽지 않음", "general.voices": "음성", "integration.eagle.enable.description": "가능할 때 '미디어를 Eagle 에 저장' 버튼 표시.", @@ -221,8 +220,8 @@ "invitation.confirmModal.continue": "계속", "invitation.confirmModal.message": "초대 코드를 생성하려면 {{INVITATION_PRICE}} 파워가 소모됩니다.", "invitation.confirmModal.title": "확인", - "invitation.earlyAccess": "현재 Follow 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", - "invitation.earlyAccessMessage": "😰 죄송합니다. 현재 Follow 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", + "invitation.earlyAccess": "현재 Folo 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", + "invitation.earlyAccessMessage": "😰 죄송합니다. 현재 Folo 는 얼리 액세스 중이며 사용하려면 초대 코드가 필요합니다.", "invitation.generateButton": "새 코드 생성", "invitation.generateCost": "친구에게 초대 코드를 생성하려면 {{INVITATION_PRICE}} 파워를 사용할 수 있습니다.", "invitation.getCodeMessage": "다음 방법을 통해 초대 코드를 얻을 수 있습니다:", @@ -311,9 +310,9 @@ "rsshub.addModal.access_key_label": "액세스 키 (선택사항)", "rsshub.addModal.add": "추가", "rsshub.addModal.base_url_label": "기본 URL", - "rsshub.addModal.description": "Follow에서 자체 인스턴스를 사용하려면 다음 환경 변수를 추가해야 합니다.", + "rsshub.addModal.description": "Folo에서 자체 인스턴스를 사용하려면 다음 환경 변수를 추가해야 합니다.", "rsshub.add_new_instance": "새 인스턴스 추가", - "rsshub.description": "RSSHub는 커뮤니티 주도의 오픈소스 RSS 네트워크입니다. Follow는 내장된 전용 인스턴스를 제공하여 수천 개의 구독 콘텐츠를 지원하며, 자체 또는 제3자 인스턴스를 사용하여 더 안정적인 콘텐츠 획득을 달성할 수 있습니다.", + "rsshub.description": "RSSHub는 커뮤니티 주도의 오픈소스 RSS 네트워크입니다. Folo는 내장된 전용 인스턴스를 제공하여 수천 개의 구독 콘텐츠를 지원하며, 자체 또는 제3자 인스턴스를 사용하여 더 안정적인 콘텐츠 획득을 달성할 수 있습니다.", "rsshub.public_instances": "사용 가능한 인스턴스", "rsshub.table.description": "설명", "rsshub.table.edit": "편집", @@ -357,9 +356,9 @@ "wallet.claim.tooltip.canClaim": "지금 {{amount}} 일일 파워를 클레임하세요!", "wallet.create.button": "지갑 생성", "wallet.create.description": " 파워를 받기 위해 무료 지갑을 생성하세요. 이는 제작자를 보상하는 데 사용할 수 있으며, 콘텐츠 기여에 대해 보상을 받을 수도 있습니다.", - "wallet.power.dailyClaim": "매일 {{amount}} 무료 파워를 클레임할 수 있으며, 이는 Follow 에서 RSS 항목에 팁을 보내는 데 사용할 수 있습니다.", - "wallet.power.description2": "파워는 {{blockchainName}} 블록체인의 ERC-20 토큰으로, Follow에서 구매와 팁에 사용할 수 있습니다.", - "wallet.power.rewardDescription": "Follow의 모든 활성 사용자는 일일 파워 보상을 받을 수 있습니다.", + "wallet.power.dailyClaim": "매일 {{amount}} 무료 파워를 클레임할 수 있으며, 이는 Folo 에서 RSS 항목에 팁을 보내는 데 사용할 수 있습니다.", + "wallet.power.description2": "파워는 {{blockchainName}} 블록체인의 ERC-20 토큰으로, Folo에서 구매와 팁에 사용할 수 있습니다.", + "wallet.power.rewardDescription": "Folo의 모든 활성 사용자는 일일 파워 보상을 받을 수 있습니다.", "wallet.power.rewardDescription2": "귀하의 레벨과 과거 활동을 기반으로 오늘 보상을 받을 수 있습니다. 자세히 알아보기", "wallet.ranking.level": "레벨", "wallet.ranking.name": "이름", @@ -368,7 +367,7 @@ "wallet.ranking.title": "파워 순위", "wallet.rewardDescription.description1": "보상은 다음 요소를 기반으로 합니다:", "wallet.rewardDescription.description2": "사용자 레벨: 더 높은 레벨은 더 많은 보상을 의미합니다.", - "wallet.rewardDescription.description3": "사용자 활동: Follow 기능을 다양하게 사용하면 활동이 증가합니다. 보상은 최소 1배에서 최대 5배까지 가능합니다.", + "wallet.rewardDescription.description3": "사용자 활동: Folo 기능을 다양하게 사용하면 활동이 증가합니다. 보상은 최소 1배에서 최대 5배까지 가능합니다.", "wallet.rewardDescription.level": "사용자 레벨", "wallet.rewardDescription.percentage": "순위 백분율", "wallet.rewardDescription.reward": "보상 배수", @@ -377,7 +376,7 @@ "wallet.sidebar_title": "파워", "wallet.transactions.amount": "금액", "wallet.transactions.date": "날짜", - "wallet.transactions.description": "특정 거래에는 Follow의 발전을 지원하기 위해 {{percentage}}%의 플랫폼 수수료가 부과됩니다. 자세한 내용은 블록체인 거래를 참조하세요.", + "wallet.transactions.description": "특정 거래에는 Folo의 발전을 지원하기 위해 {{percentage}}%의 플랫폼 수수료가 부과됩니다. 자세한 내용은 블록체인 거래를 참조하세요.", "wallet.transactions.from": "보낸 사람", "wallet.transactions.more": "블록체인 탐색기에서 더 보기", "wallet.transactions.noTransactions": "거래 없음", diff --git a/apps/desktop/locales/settings/pt.json b/apps/desktop/locales/settings/pt.json index 72f236c939..33609ee20b 100644 --- a/apps/desktop/locales/settings/pt.json +++ b/apps/desktop/locales/settings/pt.json @@ -82,7 +82,7 @@ "general.rebuild_database.title": "Reconstruir Base de Dados", "general.rebuild_database.warning.line1": "Reconstruir a base de dados vai apagar todos os seus dados locais.", "general.rebuild_database.warning.line2": "Tem a certeza de que quer continuar?", - "general.send_anonymous_data.description": "Ao optar por enviar dados anónimos de telemetria, está a contribuir para a melhoria da experiência do utilizador no Follow.", + "general.send_anonymous_data.description": "Ao optar por enviar dados anónimos de telemetria, está a contribuir para a melhoria da experiência do utilizador no Folo.", "general.send_anonymous_data.label": "Enviar dados anónimos", "general.show_unread_on_launch.description": "Mostrar conteúdo não lido ao iniciar", "general.show_unread_on_launch.label": "Mostrar conteúdo não lido ao iniciar", @@ -115,8 +115,8 @@ "invitation.confirmModal.continue": "Continuar", "invitation.confirmModal.message": "Gerar um código de convite vai custar-lhe {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "Confirmar", - "invitation.earlyAccess": "O Follow está atualmente em acesso antecipado e requer um código de convite para ser utilizado.", - "invitation.earlyAccessMessage": "😰 Desculpe, o Follow está atualmente em acesso antecipado e requer um código de convite para ser utilizado.", + "invitation.earlyAccess": "O Folo está atualmente em acesso antecipado e requer um código de convite para ser utilizado.", + "invitation.earlyAccessMessage": "😰 Desculpe, o Folo está atualmente em acesso antecipado e requer um código de convite para ser utilizado.", "invitation.generateButton": "Gerar novo código", "invitation.generateCost": "Pode gastar {{INVITATION_PRICE}} Power para gerar um código de convite para os seus amigos.", "invitation.getCodeMessage": "Pode obter um código de convite através dos seguintes métodos:", @@ -156,7 +156,7 @@ "wallet.claim.tooltip.canClaim": "Reivindique agora o seu {{amount}} Power Diário!", "wallet.create.button": "Criar Carteira", "wallet.create.description": "Crie uma carteira gratuita para receber Power, que pode ser utilizado para recompensar criadores e também para ser recompensado pelas suas contribuições de conteúdo.", - "wallet.power.dailyClaim": "Pode reivindicar {{amount}} de Power gratuito diariamente, que pode ser usado para dar dicas em entradas de RSS no Follow.", + "wallet.power.dailyClaim": "Pode reivindicar {{amount}} de Power gratuito diariamente, que pode ser usado para dar dicas em entradas de RSS no Folo.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Quantia", "wallet.transactions.date": "Data", diff --git a/apps/desktop/locales/settings/ru.json b/apps/desktop/locales/settings/ru.json index 17433674c0..cf1d5cbd7a 100644 --- a/apps/desktop/locales/settings/ru.json +++ b/apps/desktop/locales/settings/ru.json @@ -154,7 +154,7 @@ "general.rebuild_database.title": "Перестроить базу данных", "general.rebuild_database.warning.line1": "Перестроение базы данных удалит все ваши локальные данные.", "general.rebuild_database.warning.line2": "Вы уверены, что хотите продолжить?", - "general.send_anonymous_data.description": "При выборе отправки анонимных данных телеметрии вы помогаете улучшить общий пользовательский опыт Follow.", + "general.send_anonymous_data.description": "При выборе отправки анонимных данных телеметрии вы помогаете улучшить общий пользовательский опыт Folo.", "general.send_anonymous_data.label": "Отправлять анонимные данные", "general.show_quick_timeline.description": "Показать быструю временную шкалу в верхней части списка потоков.", "general.show_quick_timeline.label": "Показать временную шкалу списка потоков", @@ -214,8 +214,8 @@ "invitation.confirmModal.continue": "Продолжить", "invitation.confirmModal.message": "Создание пригласительного кода обойдется вам в {{INVITATION_PRICE}} Power.", "invitation.confirmModal.title": "Подтвердить", - "invitation.earlyAccess": "Follow находится в раннем доступе и требует пригласительного кода для использования.", - "invitation.earlyAccessMessage": "😰 Извините, Follow находится в раннем доступе и требует пригласительного кода для использования.", + "invitation.earlyAccess": "Folo находится в раннем доступе и требует пригласительного кода для использования.", + "invitation.earlyAccessMessage": "😰 Извините, Folo находится в раннем доступе и требует пригласительного кода для использования.", "invitation.generateButton": "Создать новый код", "invitation.generateCost": "Вы можете потратить {{INVITATION_PRICE}} Power, чтобы сгенерировать пригласительный код для своих друзей.", "invitation.getCodeMessage": "Вы можете получить пригласительный код следующими способами:", @@ -292,9 +292,9 @@ "rsshub.addModal.access_key_label": "Ключ доступа (необязательно)", "rsshub.addModal.add": "Добавить", "rsshub.addModal.base_url_label": "Базовый URL", - "rsshub.addModal.description": "Чтобы использовать свой собственный экземпляр в Follow, необходимо добавить следующие переменные окружения.", + "rsshub.addModal.description": "Чтобы использовать свой собственный экземпляр в Folo, необходимо добавить следующие переменные окружения.", "rsshub.add_new_instance": "Добавить новый экземпляр", - "rsshub.description": "RSSHub — это открытая сеть RSS, поддерживаемая сообществом. Follow предоставляет встроенный выделенный экземпляр и использует его для поддержки тысяч подписок. Вы также можете достичь более стабильного получения контента, используя собственные или сторонние экземпляры.", + "rsshub.description": "RSSHub — это открытая сеть RSS, поддерживаемая сообществом. Folo предоставляет встроенный выделенный экземпляр и использует его для поддержки тысяч подписок. Вы также можете достичь более стабильного получения контента, используя собственные или сторонние экземпляры.", "rsshub.public_instances": "Доступные экземпляры", "rsshub.table.description": "Описание", "rsshub.table.edit": "Редактировать", @@ -335,9 +335,9 @@ "wallet.claim.tooltip.canClaim": "Заберите свои {{amount}} Power прямо сейчас!", "wallet.create.button": "Создать кошелек", "wallet.create.description": "Создайте бесплатный кошелек для получения Power, который можно использовать для вознаграждения создателей контента и получения наград за ваши собственные публикации.", - "wallet.power.dailyClaim": "Вы можете ежедневно получать {{amount}} бесплатного Power, который можно использовать для вознаграждения записей RSS на Follow.", - "wallet.power.description2": "Power — это токен ERC-20 на блокчейне {{blockchainName}}, который можно использовать для покупок и чаевых на Follow.", - "wallet.power.rewardDescription": "Все активные пользователи на Follow имеют право на ежедневные вознаграждения Power.", + "wallet.power.dailyClaim": "Вы можете ежедневно получать {{amount}} бесплатного Power, который можно использовать для вознаграждения записей RSS на Folo.", + "wallet.power.description2": "Power — это токен ERC-20 на блокчейне {{blockchainName}}, который можно использовать для покупок и чаевых на Folo.", + "wallet.power.rewardDescription": "Все активные пользователи на Folo имеют право на ежедневные вознаграждения Power.", "wallet.power.rewardDescription2": "В зависимости от вашего уровня и прошлых действий, вы можете получить вознаграждения сегодня. Узнать больше.", "wallet.ranking.level": "Уровень", "wallet.ranking.name": "Имя", @@ -346,7 +346,7 @@ "wallet.ranking.title": "Рейтинг Power", "wallet.rewardDescription.description1": "Ежедневные вознаграждения для каждого пользователя зависят от двух факторов: уровня пользователя и активности пользователя.", "wallet.rewardDescription.description2": "Уровень пользователя: определяется сравнением рейтинга пользователя с рейтингами всех других пользователей.", - "wallet.rewardDescription.description3": "Активность пользователя: взаимодействие с различными функциями Follow может повысить активность. Награды варьируются от минимум 1x до максимум 5x.", + "wallet.rewardDescription.description3": "Активность пользователя: взаимодействие с различными функциями Folo может повысить активность. Награды варьируются от минимум 1x до максимум 5x.", "wallet.rewardDescription.level": "Уровень пользователя", "wallet.rewardDescription.percentage": "Процент в рейтинге", "wallet.rewardDescription.reward": "Множитель вознаграждения", @@ -355,7 +355,7 @@ "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Сумма", "wallet.transactions.date": "Дата", - "wallet.transactions.description": "Некоторые транзакции влекут за собой комиссию платформы в размере {{percentage}}%, чтобы поддержать дальнейшее развитие Follow. Для подробностей обратитесь к транзакции на блокчейне.", + "wallet.transactions.description": "Некоторые транзакции влекут за собой комиссию платформы в размере {{percentage}}%, чтобы поддержать дальнейшее развитие Folo. Для подробностей обратитесь к транзакции на блокчейне.", "wallet.transactions.from": "От", "wallet.transactions.more": "Посмотреть больше через блокчейн-обозреватель.", "wallet.transactions.noTransactions": "Нет транзакций", diff --git a/apps/desktop/locales/settings/tr.json b/apps/desktop/locales/settings/tr.json index 8bb5b40455..dcaf90811f 100644 --- a/apps/desktop/locales/settings/tr.json +++ b/apps/desktop/locales/settings/tr.json @@ -93,7 +93,7 @@ "general.rebuild_database.title": "Veritabanını Yeniden Oluştur", "general.rebuild_database.warning.line1": "Veritabanını yeniden oluşturmak tüm yerel verilerinizi temizleyecektir.", "general.rebuild_database.warning.line2": "Devam etmek istediğinizden emin misiniz?", - "general.send_anonymous_data.description": "Anonim telemetri verisi göndermeyi seçerek, Follow'un genel kullanıcı deneyimini iyileştirmeye katkıda bulunursunuz.", + "general.send_anonymous_data.description": "Anonim telemetri verisi göndermeyi seçerek, Folo'un genel kullanıcı deneyimini iyileştirmeye katkıda bulunursunuz.", "general.send_anonymous_data.label": "Anonim veri gönder", "general.show_unread_on_launch.description": "Başlangıçta okunmamış içeriği göster", "general.show_unread_on_launch.label": "Başlangıçta okunmamış içeriği göster", @@ -126,8 +126,8 @@ "invitation.confirmModal.continue": "Devam", "invitation.confirmModal.message": "Bir davet kodu oluşturmak size {{INVITATION_PRICE}} Power'a mal olacak.", "invitation.confirmModal.title": "Onayla", - "invitation.earlyAccess": "Follow şu anda erken erişim aşamasındadır ve kullanmak için bir davet kodu gerektirir.", - "invitation.earlyAccessMessage": "😰 Üzgünüz, Follow şu anda erken erişim aşamasındadır ve kullanmak için bir davet kodu gerektirir.", + "invitation.earlyAccess": "Folo şu anda erken erişim aşamasındadır ve kullanmak için bir davet kodu gerektirir.", + "invitation.earlyAccessMessage": "😰 Üzgünüz, Folo şu anda erken erişim aşamasındadır ve kullanmak için bir davet kodu gerektirir.", "invitation.generateButton": "Yeni kod oluştur", "invitation.generateCost": "Arkadaşlarınız için bir davet kodu oluşturmak için {{INVITATION_PRICE}} Power harcayabilirsiniz.", "invitation.getCodeMessage": "Aşağıdaki yöntemlerle bir davet kodu alabilirsiniz:", @@ -196,7 +196,7 @@ "wallet.claim.tooltip.canClaim": "{{amount}} Günlük Power'ınızı şimdi alın!", "wallet.create.button": "Cüzdan Oluştur", "wallet.create.description": "İçerik katkılarınız için ödüllendirilmek ve ayrıca içerik oluşturucuları ödüllendirmek için kullanılabilecek Power almak için ücretsiz bir cüzdan oluşturun.", - "wallet.power.dailyClaim": "Günlük olarak {{amount}} ücretsiz Power alabilirsiniz, bu Follow'da RSS girdilerine bahşiş vermek için kullanılabilir.", + "wallet.power.dailyClaim": "Günlük olarak {{amount}} ücretsiz Power alabilirsiniz, bu Folo'da RSS girdilerine bahşiş vermek için kullanılabilir.", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "Miktar", "wallet.transactions.date": "Tarih", diff --git a/apps/desktop/locales/settings/zh-CN.json b/apps/desktop/locales/settings/zh-CN.json index 74033aa741..80e8fe06e7 100644 --- a/apps/desktop/locales/settings/zh-CN.json +++ b/apps/desktop/locales/settings/zh-CN.json @@ -187,7 +187,9 @@ "general.startup_screen.timeline": "时间线", "general.startup_screen.title": "起始界面", "general.timeline": "时间线", - "general.translation_language": "翻译语言", + "general.action_language.label": "自动化语言", + "general.action_language.default": "默认（界面语言）", + "general.action_language.description": "用于翻译和总结的语言。", "general.unread": "未读", "general.voices": "声音", "integration.eagle.enable.description": "显示「保存到 Eagle」按钮（如果可用）。", @@ -236,8 +238,8 @@ "invitation.confirmModal.continue": "继续", "invitation.confirmModal.message": "生成邀请码将花费 {{INVITATION_PRICE}} Power。", "invitation.confirmModal.title": "确认", - "invitation.earlyAccess": "Follow 目前处于早期开发状态，需要邀请码才能使用。", - "invitation.earlyAccessMessage": "😰 抱歉，Follow 目前处于抢先体验阶段，需要邀请码才能使用。", + "invitation.earlyAccess": "Folo 目前处于早期开发状态，需要邀请码才能使用。", + "invitation.earlyAccessMessage": "😰 抱歉，Folo 目前处于抢先体验阶段，需要邀请码才能使用。", "invitation.generateButton": "生成邀请码", "invitation.generateCost": "你可以花费 {{INVITATION_PRICE}} Power 为你的朋友生成邀请码。", "invitation.getCodeMessage": "通过以下方式获取邀请码：", @@ -295,6 +297,7 @@ "profile.email.unverified": "未验证", "profile.email.verification_sent": "验证邮件已发送。", "profile.email.verified": "已验证", + "profile.email.verify_email": "请验证你的邮件地址 ({{email_address}}) 以继续。", "profile.handle.description": "你的唯一标识。", "profile.handle.label": "唯一标识", "profile.link_social.authentication": "身份验证", @@ -326,9 +329,9 @@ "rsshub.addModal.access_key_label": "访问密钥（可选）", "rsshub.addModal.add": "添加", "rsshub.addModal.base_url_label": "根 URL", - "rsshub.addModal.description": "要在 Follow 中使用自己的实例，必须将以下环境变量添加到实例。", + "rsshub.addModal.description": "要在 Folo 中使用自己的实例，必须将以下环境变量添加到实例。", "rsshub.add_new_instance": "添加新实例", - "rsshub.description": "RSSHub 是由社区驱动的开源 RSS 网络。Follow 提供了内建的专用实例来支持数以千计的订阅内容，你也可以通过使用自己的或第三方的实例来实现更稳定的内容获取。", + "rsshub.description": "RSSHub 是由社区驱动的开源 RSS 网络。Folo 提供了内建的专用实例来支持数以千计的订阅内容，你也可以通过使用自己的或第三方的实例来实现更稳定的内容获取。", "rsshub.public_instances": "实例", "rsshub.table.description": "描述", "rsshub.table.edit": "编辑", @@ -372,9 +375,9 @@ "wallet.claim.tooltip.canClaim": "立即领取你的 {{amount}} 每日 Power！", "wallet.create.button": "创建钱包", "wallet.create.description": "创建一个免费钱包以获得 Power。你可以给其他创作者打赏，也可以通过贡献内容来获得奖励。", - "wallet.power.dailyClaim": "每天可以领取 {{amount}} 个免费 Power。Power 可用于在 Follow 上打赏 RSS 条目。", - "wallet.power.description2": "Power 是 {{blockchainName}} 区块链上的一个 ERC-20 代币，可用于在 Follow 平台上进行购买和打赏。", - "wallet.power.rewardDescription": "所有活跃在 Follow 的用户都有资格获得每日 Power 奖励。", + "wallet.power.dailyClaim": "每天可以领取 {{amount}} 个免费 Power。Power 可用于在 Folo 上打赏 RSS 条目。", + "wallet.power.description2": "Power 是 {{blockchainName}} 区块链上的一个 ERC-20 代币，可用于在 Folo 平台上进行购买和打赏。", + "wallet.power.rewardDescription": "所有活跃在 Folo 的用户都有资格获得每日 Power 奖励。", "wallet.power.rewardDescription2": "根据你的等级和过往活跃度，今日可以获得 的奖励。了解更多…", "wallet.ranking.level": "等级", "wallet.ranking.name": "用户", @@ -383,7 +386,7 @@ "wallet.ranking.title": "Power 排名", "wallet.rewardDescription.description1": "每日奖励基于「用户等级」和「用户活跃度」两部分计算。", "wallet.rewardDescription.description2": "用户等级：由用户在 Power 排行榜的排名决定。", - "wallet.rewardDescription.description3": "用户活跃度：使用 Follow 功能可以提升活跃度，活跃度的奖励倍数范围是 1x ~ 5x。", + "wallet.rewardDescription.description3": "用户活跃度：使用 Folo 功能可以提升活跃度，活跃度的奖励倍数范围是 1x ~ 5x。", "wallet.rewardDescription.level": "用户等级", "wallet.rewardDescription.percentage": "排名比例", "wallet.rewardDescription.reward": "奖励倍数", @@ -392,7 +395,7 @@ "wallet.sidebar_title": "Power", "wallet.transactions.amount": "数额", "wallet.transactions.date": "日期", - "wallet.transactions.description": "部分交易会收取 {{percentage}}% 的平台手续费用于 Follow 的发展，详情请查看区块链交易记录。", + "wallet.transactions.description": "部分交易会收取 {{percentage}}% 的平台手续费用于 Folo 的发展，详情请查看区块链交易记录。", "wallet.transactions.from": "发送者", "wallet.transactions.more": "通过区块链浏览器查看更多交易…", "wallet.transactions.noTransactions": "无交易记录", diff --git a/apps/desktop/locales/settings/zh-HK.json b/apps/desktop/locales/settings/zh-HK.json index 2ffa87bd85..5874d3472e 100644 --- a/apps/desktop/locales/settings/zh-HK.json +++ b/apps/desktop/locales/settings/zh-HK.json @@ -54,11 +54,22 @@ "actions.title": "動作", "appearance.code_highlight_theme": "程式碼高亮主題", "appearance.content": "內容", + "appearance.content_font.default": "預設（界面字體）", "appearance.content_font.label": "內容字體", + "appearance.content_font_size": "內容字體大小", + "appearance.content_line_height.label": "內容行高", + "appearance.content_line_height.loose": "寬鬆", + "appearance.content_line_height.normal": "正常", + "appearance.content_line_height.relaxed": "舒適", + "appearance.content_line_height.snug": "緊湊", + "appearance.content_line_height.tight": "緊密", "appearance.custom_css.button": "編輯", "appearance.custom_css.description": "自定義 CSS 樣式內容", "appearance.custom_css.label": "自定義 CSS", "appearance.custom_font": "自訂字體", + "appearance.date_format": "日期格式", + "appearance.font.custom": "自訂", + "appearance.font.system": "系統界面", "appearance.fonts": "字體", "appearance.general": "一般", "appearance.guess_code_language.description": "使用模型來推斷未標註程式碼區塊的主要程式語言", @@ -80,7 +91,11 @@ "appearance.sidebar": "側邊欄", "appearance.sidebar_show_unread_count.label": "側邊欄顯示未讀數量", "appearance.sidebar_title": "外觀", - "appearance.text_size.label": "文字大小", + "appearance.text_size.default": "預設", + "appearance.text_size.label": "全域文字大小", + "appearance.text_size.large": "大", + "appearance.text_size.medium": "中", + "appearance.text_size.smaller": "較小", "appearance.theme.dark": "深色", "appearance.theme.label": "主題", "appearance.theme.light": "淺色", @@ -97,6 +112,11 @@ "appearance.zen_mode.description": "Zen 模式是一種不受打擾的閱讀模式，讓您專注於內容而不會有任何干擾。啟用 Zen 模式後，側邊欄將被隱藏。", "appearance.zen_mode.label": "Zen 模式", "common.give_star": "喜歡我們的產品嗎？ 在 GitHub 上給我們 star 吧！", + "customizeToolbar.more_actions.description": "將顯示在下拉選單中", + "customizeToolbar.more_actions.title": "更多動作", + "customizeToolbar.quick_actions.description": "自訂並重新排列你常用的動作", + "customizeToolbar.quick_actions.title": "快速動作", + "customizeToolbar.reset_layout": "重設為預設佈局", "customizeToolbar.title": "自訂工具列", "data_control.app_cache_limit.description": "應用程式快取的最大大小。當快取達到此大小時，最舊的項目將被刪除以釋放空間。", "data_control.app_cache_limit.label": "應用程式快取限制", @@ -115,11 +135,11 @@ "general.auto_group.label": "自動分組", "general.cache": "快取", "general.data": "數據", - "general.data_file.label": "數據文件", + "general.data_file.label": "數據檔案", "general.data_persist.description": "本地儲存數據以啟用離線存取和本地搜尋", "general.data_persist.label": "離線使用時保留數據", "general.export.button": "匯出", - "general.export.description": "匯出你的訂閱到 OPML 文件", + "general.export.description": "匯出你的訂閱到 OPML 檔案", "general.export.folder_mode.description": "決定如何組織匯出資料夾。", "general.export.folder_mode.label": "資料夾模式", "general.export.folder_mode.option.category": "分類", @@ -135,11 +155,11 @@ "general.language": "語言", "general.launch_at_login": "登入時啟動", "general.log_file.button": "顯示", - "general.log_file.description": "在系統中顯示日誌文件", - "general.log_file.label": "日誌文件", + "general.log_file.description": "在系統中顯示日誌檔案", + "general.log_file.label": "日誌檔案", "general.mark_as_read.hover.description": "游標懸停時自動將條目標記為已讀", "general.mark_as_read.hover.label": "懸停時標記為已讀", - "general.mark_as_read.render.description": "當條目進入視圖時，會自動標記單層條目（例如社交媒體貼文、圖片、視頻觀看）為已讀。", + "general.mark_as_read.render.description": "當條目進入視圖時，會自動標記單層條目（例如社交媒體貼文、圖片、影片觀看）為已讀。", "general.mark_as_read.render.label": "在視圖中時標記為已讀", "general.mark_as_read.scroll.description": "當滾動出視圖時，自動標記條目為已讀。", "general.mark_as_read.scroll.label": "滾動時標記為已讀", @@ -155,7 +175,7 @@ "general.rebuild_database.title": "重建數據庫", "general.rebuild_database.warning.line1": "重建數據庫會清除所有本地數據", "general.rebuild_database.warning.line2": "你確定要繼續嗎？", - "general.send_anonymous_data.description": "選擇發送匿名的遙測數據，將有助於提升 Follow 的整體用戶體驗。", + "general.send_anonymous_data.description": "選擇發送匿名的遙測數據，將有助於提升 Folo 的整體用戶體驗。", "general.send_anonymous_data.label": "發送匿名數據", "general.show_quick_timeline.description": "在訂閱源清單頂部顯示快速時間軸。", "general.show_quick_timeline.label": "顯示訂閱源清單時間軸", @@ -167,7 +187,6 @@ "general.startup_screen.timeline": "時間軸", "general.startup_screen.title": "啟動畫面", "general.timeline": "時間軸", - "general.translation_language": "翻譯語言", "general.unread": "未讀", "general.voices": "語音", "integration.eagle.enable.description": "顯示「將媒體儲存到 Eagle」按鈕（如果可用）", @@ -177,7 +196,7 @@ "integration.instapaper.enable.label": "啟用", "integration.instapaper.password.label": "Instapaper 密碼", "integration.instapaper.title": "Instapaper", - "integration.instapaper.username.label": "Instapaper 用戶名", + "integration.instapaper.username.label": "Instapaper 使用者名稱", "integration.obsidian.enable.description": "顯示「儲存至 Obsidian」按鈕（如果可用）", "integration.obsidian.enable.label": "啟用", "integration.obsidian.title": "Obsidian", @@ -216,8 +235,8 @@ "invitation.confirmModal.continue": "繼續", "invitation.confirmModal.message": "生成邀請代碼將消耗 {{INVITATION_PRICE}} Power。", "invitation.confirmModal.title": "確認", - "invitation.earlyAccess": "Follow 目前處於早期開發階段，需要邀請代碼才能使用。", - "invitation.earlyAccessMessage": "😰 對不起，Follow 目前處於早期開發階段，需要邀請代碼才能使用。", + "invitation.earlyAccess": "Folo 目前處於早期開發階段，需要邀請代碼才能使用。", + "invitation.earlyAccessMessage": "😰 對不起，Folo 目前處於早期開發階段，需要邀請代碼才能使用。", "invitation.generateButton": "生成新代碼", "invitation.generateCost": "你可以花費 {{INVITATION_PRICE}} Power 來生成邀請代碼給你的朋友。", "invitation.getCodeMessage": "你可以通過以下方法獲得邀請代碼：", @@ -262,7 +281,7 @@ "lists.submit": "提交", "lists.subscriptions": "訂閱", "lists.title": "標題", - "lists.view": "視圖", + "lists.view": "檢視", "profile.avatar.label": "頭像", "profile.change_password.label": "更改密碼", "profile.confirm_password.label": "確認密碼", @@ -284,19 +303,31 @@ "profile.name.description": "你的公開顯示名稱", "profile.name.label": "顯示名稱", "profile.new_password.label": "新密碼", + "profile.no_password": "重設你的密碼以設置新密碼。", "profile.password.label": "密碼", "profile.reset_password_mail_sent": "重設密碼郵件已發送", "profile.sidebar_title": "個人資料", "profile.submit": "提交", "profile.title": "個人資料設置", + "profile.totp_code.init": "使用 TOTP 應用程式掃描 QR 碼", + "profile.totp_code.invalid": "無效的 TOTP 驗證碼。", + "profile.totp_code.label": "TOTP 驗證碼", + "profile.totp_code.title": "輸入 TOTP 驗證碼", + "profile.two_factor.disable": "停用雙重驗證", + "profile.two_factor.disabled": "雙重驗證已停用。", + "profile.two_factor.enable": "啟用雙重驗證", + "profile.two_factor.enable_notice": "您需要啟用雙重驗證才能執行此操作。", + "profile.two_factor.enabled": "雙重驗證已啟用。", + "profile.two_factor.label": "雙重驗證", + "profile.two_factor.no_password": "您需要先設置密碼才能啟用雙重驗證。", "profile.updateSuccess": "個人資料已更新", "profile.update_password_success": "密碼已更新", "rsshub.addModal.access_key_label": "存取金鑰（選填）", "rsshub.addModal.add": "新增", "rsshub.addModal.base_url_label": "基本網址", - "rsshub.addModal.description": "要在 Follow 中使用您自己的實例，您必須將以下環境變數新增到它。", + "rsshub.addModal.description": "要在 Folo 中使用您自己的實例，您必須將以下環境變數新增到它。", "rsshub.add_new_instance": "新增實例", - "rsshub.description": "RSSHub 是一個由社群驅動的開源 RSS 網絡。Follow 提供內建的專用實例，並使用它來支援成千上萬的訂閱內容，您也可以透過使用您自己的或第三方實例來實現更穩定的內容獲取。", + "rsshub.description": "RSSHub 是一個由社群驅動的開源 RSS 網絡。Folo 提供內建的專用實例，並使用它來支援成千上萬的訂閱內容，您也可以透過使用您自己的或第三方實例來實現更穩定的內容獲取。", "rsshub.public_instances": "可用實例", "rsshub.table.description": "描述", "rsshub.table.edit": "編輯", @@ -340,9 +371,9 @@ "wallet.claim.tooltip.canClaim": "立即領取你的 {{amount}} 每日 Power！", "wallet.create.button": "創建錢包", "wallet.create.description": "創建一個免費的錢包來接收 Power，可以用來贊助創作者，也可以因你的內容貢獻而獲得回報。", - "wallet.power.dailyClaim": "你可以每日領取 {{amount}} 免費的 Power，用於在 Follow 上贊助 RSS 條目。", - "wallet.power.description2": "Power 是 {{blockchainName}} 區塊鏈上的 ERC-20 代币，可用於 Follow 購買或贊助", - "wallet.power.rewardDescription": "所有 Follow 的活躍用戶都可以獲得每日 Power 獎勵", + "wallet.power.dailyClaim": "你可以每日領取 {{amount}} 免費的 Power，用於在 Folo 上贊助 RSS 條目。", + "wallet.power.description2": "Power 是 {{blockchainName}} 區塊鏈上的 ERC-20 代币，可用於 Folo 購買或贊助", + "wallet.power.rewardDescription": "所有 Folo 的活躍用戶都可以獲得每日 Power 獎勵", "wallet.power.rewardDescription2": "根據你的等級和過去活動，你獲得一份 奖励。更多詳情", "wallet.ranking.level": "等級", "wallet.ranking.name": "用戶", @@ -351,7 +382,7 @@ "wallet.ranking.title": "Power 排名", "wallet.rewardDescription.description1": "每日獎勵基於「用戶等級」和「活躍度」兩部分計算", "wallet.rewardDescription.description2": "用戶等級: 由 Power 排行榜的排名決定", - "wallet.rewardDescription.description3": "用戶活躍度: 使用 Follow 功能可以提升活躍度，活躍度獎勵倍數範圍是 1x ~ 5x", + "wallet.rewardDescription.description3": "用戶活躍度: 使用 Folo 功能可以提升活躍度，活躍度獎勵倍數範圍是 1x ~ 5x", "wallet.rewardDescription.level": "用戶等級", "wallet.rewardDescription.percentage": "排名比例", "wallet.rewardDescription.reward": "獎勵倍數", @@ -360,7 +391,7 @@ "wallet.sidebar_title": "Power", "wallet.transactions.amount": "數量", "wallet.transactions.date": "日期", - "wallet.transactions.description": "部分交易会收取 {{percentage}}% 的平臺手續費用於 Follow 的發展，詳情請查看區塊鏈交易記錄。", + "wallet.transactions.description": "部分交易会收取 {{percentage}}% 的平臺手續費用於 Folo 的發展，詳情請查看區塊鏈交易記錄。", "wallet.transactions.from": "來自", "wallet.transactions.more": "通過區塊鏈瀏覽器查看更多交易", "wallet.transactions.noTransactions": "無交易記錄", diff --git a/apps/desktop/locales/settings/zh-TW.json b/apps/desktop/locales/settings/zh-TW.json index d432ec64c5..e348ac5e6f 100644 --- a/apps/desktop/locales/settings/zh-TW.json +++ b/apps/desktop/locales/settings/zh-TW.json @@ -160,7 +160,7 @@ "general.rebuild_database.title": "重置資料庫", "general.rebuild_database.warning.line1": "重置資料庫將會清除您所有的本機資料。", "general.rebuild_database.warning.line2": "您確定要繼續嗎？", - "general.send_anonymous_data.description": "選擇傳送匿名使用資料，您將幫助改善 Follow 的整體使用體驗。", + "general.send_anonymous_data.description": "選擇傳送匿名使用資料，您將幫助改善 Folo 的整體使用體驗。", "general.send_anonymous_data.label": "傳送匿名資料", "general.show_quick_timeline.description": "在 RSS 摘要列表頂部顯示快速時間軸。", "general.show_quick_timeline.label": "顯示 RSS 摘要列表時間軸", @@ -172,7 +172,6 @@ "general.startup_screen.timeline": "時間軸", "general.startup_screen.title": "開始畫面", "general.timeline": "時間軸", - "general.translation_language": "翻譯語言", "general.unread": "未讀", "general.voices": "聲音", "integration.eagle.enable.description": "顯示「將媒體儲存到 Eagle」按鈕（如果可用）。", @@ -221,7 +220,7 @@ "invitation.confirmModal.continue": "繼續", "invitation.confirmModal.message": "產生邀請碼將會花費您 {{INVITATION_PRICE}} Power。", "invitation.confirmModal.title": "確認", - "invitation.earlyAccess": "Follow 目前處於早期開發狀態，需要邀請碼才能使用。", + "invitation.earlyAccess": "Folo 目前處於早期開發狀態，需要邀請碼才能使用。", "invitation.earlyAccessMessage": "😰 抱歉，關注目前處於搶先體驗階段，需要邀請碼才能使用。", "invitation.generateButton": "產生邀請碼", "invitation.generateCost": "您可以花費 {{INVITATION_PRICE}} Power 為您的朋友產生邀請碼。", @@ -311,9 +310,9 @@ "rsshub.addModal.access_key_label": "存取金鑰（選填）", "rsshub.addModal.add": "新增", "rsshub.addModal.base_url_label": "基礎 URL", - "rsshub.addModal.description": "要在 Follow 中使用自己的 RSSHub 實例伺服器，必須將以下環境變數新增到伺服器中。", + "rsshub.addModal.description": "要在 Folo 中使用自己的 RSSHub 實例伺服器，必須將以下環境變數新增到伺服器中。", "rsshub.add_new_instance": "新增 RSSHub 實例伺服器", - "rsshub.description": "RSSHub 是由社群驅動的開源 RSS 網路。Follow 提供了內建的專用實例伺服器來支持數以千計的訂閱內容，你也可以通過使用自己的或第三方的實例伺服器來實現更穩定的內容獲取。", + "rsshub.description": "RSSHub 是由社群驅動的開源 RSS 網路。Folo 提供了內建的專用實例伺服器來支持數以千計的訂閱內容，你也可以通過使用自己的或第三方的實例伺服器來實現更穩定的內容獲取。", "rsshub.public_instances": "實例伺服器", "rsshub.table.description": "描述", "rsshub.table.edit": "編輯", @@ -357,9 +356,9 @@ "wallet.claim.tooltip.canClaim": "立即領取您的 {{amount}} 每日 Power！", "wallet.create.button": "建立錢包", "wallet.create.description": "建立一個免費錢包以接收 Power，可用於獎勵創作者，也可以因您的內容貢獻而獲得獎勵。", - "wallet.power.dailyClaim": "您每天可以領取 {{amount}} 個免費 Power，可用於在 Follow 上贊助 RSS 項目。", - "wallet.power.description2": "Power 是 {{blockchainName}} 區塊鏈上的 ERC-20 代幣，可用於 Follow 購買或贊助", - "wallet.power.rewardDescription": "所有 Follow 的活躍使用者都可以獲得每日 Power 獎勵", + "wallet.power.dailyClaim": "您每天可以領取 {{amount}} 個免費 Power，可用於在 Folo 上贊助 RSS 項目。", + "wallet.power.description2": "Power 是 {{blockchainName}} 區塊鏈上的 ERC-20 代幣，可用於 Folo 購買或贊助", + "wallet.power.rewardDescription": "所有 Folo 的活躍使用者都可以獲得每日 Power 獎勵", "wallet.power.rewardDescription2": "根據你的等級和過去活動，您將獲得一份 獎勵。更多詳情", "wallet.ranking.level": "等級", "wallet.ranking.name": "使用者", @@ -368,7 +367,7 @@ "wallet.ranking.title": "Power 排名", "wallet.rewardDescription.description1": "每日獎勵基於「使用者等級」和「活躍度」兩部分計算", "wallet.rewardDescription.description2": "使用者等級: 由 Power 排行榜的排名決定", - "wallet.rewardDescription.description3": "使用者活躍度: 使用 Follow 功能可以提升活躍度，活躍度獎勵倍數範圍是 1x ~ 5x", + "wallet.rewardDescription.description3": "使用者活躍度: 使用 Folo 功能可以提升活躍度，活躍度獎勵倍數範圍是 1x ~ 5x", "wallet.rewardDescription.level": "使用者等級", "wallet.rewardDescription.percentage": "排名比例", "wallet.rewardDescription.reward": "獎勵倍數", @@ -377,7 +376,7 @@ "wallet.sidebar_title": "Power", "wallet.transactions.amount": "額度", "wallet.transactions.date": "日期", - "wallet.transactions.description": "部分交易會收取 {{percentage}}% 的平臺手續費用於 Follow 的發展，詳情請查看區塊鏈交易記錄。", + "wallet.transactions.description": "部分交易會收取 {{percentage}}% 的平臺手續費用於 Folo 的發展，詳情請查看區塊鏈交易記錄。", "wallet.transactions.from": "發送者", "wallet.transactions.more": "通過區塊鏈瀏覽器查看更多交易…", "wallet.transactions.noTransactions": "無交易紀錄", diff --git a/apps/desktop/locales/shortcuts/zh-HK.json b/apps/desktop/locales/shortcuts/zh-HK.json index 7d87ceb896..4f29ea3ac0 100644 --- a/apps/desktop/locales/shortcuts/zh-HK.json +++ b/apps/desktop/locales/shortcuts/zh-HK.json @@ -1,5 +1,5 @@ { - "keys.audio.playPause": "播放/暫停（當音頻播放器開啟時）", + "keys.audio.playPause": "播放/暫停（當音訊播放器開啟時）", "keys.entries.markAllAsRead": "標記所有為已讀", "keys.entries.next": "下一條目", "keys.entries.previous": "上一條目", @@ -23,11 +23,11 @@ "keys.layout.toggleSidebar": "顯示/隱藏訂閱側邊欄", "keys.layout.toggleWideMode": "切換寬屏模式", "keys.layout.zenMode": "Zen 模式", - "keys.misc.quickSearch": "快速搜索", - "keys.type.audio": "音頻", + "keys.misc.quickSearch": "快速搜尋", + "keys.type.audio": "音訊", "keys.type.entries": "條目列表", "keys.type.entry": "條目", - "keys.type.feeds": "訂閲源", + "keys.type.feeds": "訂閱源", "keys.type.layout": "佈局", "keys.type.misc": "其他", "sidebar_title": "快捷鍵" diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 50efc09a02..b530dafc19 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,10 +1,10 @@ { - "name": "Follow", + "name": "Folo", "type": "module", - "version": "0.3.12", + "version": "0.3.13", "private": true, "description": "Follow everything in one place", - "author": "Follow Team", + "author": "Folo Team", "homepage": "https://github.com/RSSNext", "repository": { "url": "https://github.com/RSSNext/follow", @@ -38,6 +38,7 @@ "devDependencies": { "@clack/prompts": "0.10.0", "@electron-forge/cli": "7.7.0", + "@electron-forge/maker-appx": "7.7.0", "@electron-forge/maker-dmg": "7.7.0", "@electron-forge/maker-pkg": "7.7.0", "@electron-forge/maker-squirrel": "7.7.0", @@ -63,7 +64,7 @@ "cssnano": "7.0.6", "dotenv": "16.4.7", "drizzle-orm": "0.40.0", - "electron": "35.0.1", + "electron": "34.2.0", "electron-devtools-installer": "4.0.0", "electron-packager-languages": "0.6.0", "electron-vite": "3.0.0", @@ -80,8 +81,8 @@ "unplugin-ast": "0.14.3", "utf-8-validate": "6.0.5" }, - "productName": "Follow", - "mainHash": "03d744e78f7b1eedc24f83c05939b1faaa07b3b5ff15cfc6242594c74c726637", + "productName": "Folo", + "mainHash": "569e7dd06fa94fcc22fc451346fbf1c9e8203d364cb84d49a7a08bf7dff39630", "bump": { "before": [ "git pull --rebase", diff --git a/apps/desktop/src/main/package.json b/apps/desktop/src/main/package.json index 12fb3fba54..26cd925d68 100644 --- a/apps/desktop/src/main/package.json +++ b/apps/desktop/src/main/package.json @@ -2,7 +2,7 @@ "name": "@follow/electron-main", "type": "module", "private": true, - "author": "Follow Team", + "author": "Folo Team", "license": "GPL-3.0-only", "homepage": "https://github.com/RSSNext", "repository": { @@ -40,7 +40,7 @@ "es-toolkit": "1.33.0", "fast-folder-size": "2.4.0", "font-list": "1.5.1", - "i18next": "24.2.2", + "i18next": "24.2.3", "js-yaml": "4.1.0", "linkedom": "0.18.9", "lowdb": "7.0.1", @@ -56,7 +56,7 @@ "@follow/types": "workspace:*", "@types/js-yaml": "4.0.9", "@types/node": "22.13.10", - "electron": "35.0.1", + "electron": "34.2.0", "electron-devtools-installer": "4.0.0", "hono": "4.7.4" } diff --git a/apps/desktop/src/main/preload/index.ts b/apps/desktop/src/main/preload/index.ts index cc0f2290b9..d5590bdc46 100644 --- a/apps/desktop/src/main/preload/index.ts +++ b/apps/desktop/src/main/preload/index.ts @@ -2,7 +2,7 @@ import os from "node:os" import { platform } from "node:process" import { electronAPI } from "@electron-toolkit/preload" -import { contextBridge } from "electron" +import { clipboard, contextBridge } from "electron" export const isMacOS = platform === "darwin" @@ -49,4 +49,10 @@ if (process.contextIsolated) { window.api = api // @ts-ignore (define in dts) window.platform = process.platform + + Object.defineProperty(window.navigator, "clipboard", { + get: () => { + return clipboard + }, + }) } diff --git a/apps/desktop/src/main/src/index.ts b/apps/desktop/src/main/src/index.ts index 4e4082ce13..f1e15a1455 100644 --- a/apps/desktop/src/main/src/index.ts +++ b/apps/desktop/src/main/src/index.ts @@ -150,7 +150,7 @@ function bootstrap() { if (responseHeaders?.["set-cookie"]) { const cookies = responseHeaders["set-cookie"] as string[] cookies.forEach((cookie) => { - const cookieObj = parse(cookie) + const cookieObj = parse(cookie, { decode: (value) => value }) Object.keys(cookieObj).forEach((name) => { const value = cookieObj[name] mainWindow.webContents.session.cookies.set({ @@ -232,7 +232,7 @@ function bootstrap() { if (ck && apiURL) { setBetterAuthSessionCookie(ck) - const cookie = parse(atob(ck)) + const cookie = parse(atob(ck), { decode: (value) => value }) Object.keys(cookie).forEach((name) => { const value = cookie[name] mainWindow.webContents.session.cookies.set({ diff --git a/apps/desktop/src/main/src/lib/api-client.ts b/apps/desktop/src/main/src/lib/api-client.ts index 8f3d979826..27e773c9f0 100644 --- a/apps/desktop/src/main/src/lib/api-client.ts +++ b/apps/desktop/src/main/src/lib/api-client.ts @@ -38,7 +38,7 @@ export const apiClient = hc("", { "X-App-Version": PKG.version, "X-App-Dev": process.env.NODE_ENV === "development" ? "1" : "0", Cookie: betterAuthSessionCookie ? atob(betterAuthSessionCookie) : "", - "User-Agent": `Follow/${PKG.version}${user?.id ? ` uid: ${user.id}` : ""}`, + "User-Agent": `Folo/${PKG.version}${user?.id ? ` uid: ${user.id}` : ""}`, } }, }) diff --git a/apps/desktop/src/renderer/index.html b/apps/desktop/src/renderer/index.html index 2b9372b02c..b92cf8851f 100644 --- a/apps/desktop/src/renderer/index.html +++ b/apps/desktop/src/renderer/index.html @@ -11,22 +11,22 @@ - - + + - Follow + Folo - + - + diff --git a/apps/desktop/src/renderer/package.json b/apps/desktop/src/renderer/package.json index 4e39fc018c..99c6b396e6 100644 --- a/apps/desktop/src/renderer/package.json +++ b/apps/desktop/src/renderer/package.json @@ -34,18 +34,18 @@ "@radix-ui/react-slot": "1.1.2", "@sentry/react": "9.5.0", "@shikijs/transformers": "3.2.1", - "@tanstack/query-sync-storage-persister": "5.67.3", - "@tanstack/react-query": "5.67.3", - "@tanstack/react-query-devtools": "5.67.3", - "@tanstack/react-query-persist-client": "5.67.3", - "@tanstack/react-virtual": "3.13.3", + "@tanstack/query-sync-storage-persister": "5.68.0", + "@tanstack/react-query": "5.68.0", + "@tanstack/react-query-devtools": "5.68.0", + "@tanstack/react-query-persist-client": "5.68.0", + "@tanstack/react-virtual": "3.13.4", "@use-gesture/react": "10.3.1", "@welldone-software/why-did-you-render": "10.0.1", "@yornaath/batshit": "0.10.1", "camelcase-keys": "9.1.3", "click-to-react-component": "1.1.2", "clsx": "2.1.1", - "cmdk": "1.0.4", + "cmdk": "1.1.1", "dayjs": "1.11.13", "dexie": "4.0.11", "dexie-export-import": "4.1.4", @@ -60,7 +60,7 @@ "fuse.js": "7.1.0", "hast-util-to-jsx-runtime": "2.3.6", "hast-util-to-mdast": "10.1.2", - "i18next": "24.2.2", + "i18next": "24.2.3", "i18next-browser-languagedetector": "8.0.4", "idb-keyval": "6.2.1", "immer": "10.1.1", @@ -90,6 +90,7 @@ "sonner": "2.0.1", "tldts": "6.1.84", "use-context-selector": "2.0.0", + "use-sync-external-store": "1.4.0", "usehooks-ts": "3.1.1", "zod": "3.24.2", "zustand": "5.0.3" diff --git a/apps/desktop/src/renderer/src/atoms/player.ts b/apps/desktop/src/renderer/src/atoms/player.ts index d8adc89e09..267595778c 100644 --- a/apps/desktop/src/renderer/src/atoms/player.ts +++ b/apps/desktop/src/renderer/src/atoms/player.ts @@ -99,8 +99,11 @@ export const AudioPlayer = { currentTime: this.audio.currentTime, }) }, 1000) - if (Number.isNaN(this.audio.duration) || this.audio.duration === Infinity) { - this.audio.currentTime = 0 + + this.audio.onloadedmetadata = () => { + if (Number.isNaN(this.audio.duration) || this.audio.duration === Infinity) { + this.audio.currentTime = 0 + } } const currentActionId = this.__currentActionId diff --git a/apps/desktop/src/renderer/src/atoms/settings/general.ts b/apps/desktop/src/renderer/src/atoms/settings/general.ts index ca78f02585..f4a28a9e8c 100644 --- a/apps/desktop/src/renderer/src/atoms/settings/general.ts +++ b/apps/desktop/src/renderer/src/atoms/settings/general.ts @@ -1,13 +1,16 @@ import { createSettingAtom } from "@follow/atoms/helper/setting.js" +import type { SupportedLanguages } from "@follow/models" import type { GeneralSettings } from "@follow/shared/interface/settings" import { jotaiStore } from "~/lib/jotai" +export const DEFAULT_ACTION_LANGUAGE = "default" + const createDefaultSettings = (): GeneralSettings => ({ // App appLaunchOnStartup: false, language: "en", - translationLanguage: "zh-CN", + actionLanguage: DEFAULT_ACTION_LANGUAGE, // mobile app startupScreen: "timeline", @@ -47,6 +50,14 @@ export const { settingAtom: __generalSettingAtom, } = createSettingAtom("general", createDefaultSettings) +export function useActionLanguage() { + const actionLanguage = useGeneralSettingSelector((s) => s.actionLanguage) + const language = useGeneralSettingSelector((s) => s.language) + return ( + actionLanguage === DEFAULT_ACTION_LANGUAGE ? language : actionLanguage + ) as SupportedLanguages +} + export const subscribeShouldUseIndexedDB = (callback: (value: boolean) => void) => jotaiStore.sub(__generalSettingAtom, () => callback(getGeneralSettings().dataPersist)) diff --git a/apps/desktop/src/renderer/src/components/ui/collapse/Collapse.tsx b/apps/desktop/src/renderer/src/components/ui/collapse/Collapse.tsx index 222b0d7e2d..d205a6f3ce 100644 --- a/apps/desktop/src/renderer/src/components/ui/collapse/Collapse.tsx +++ b/apps/desktop/src/renderer/src/components/ui/collapse/Collapse.tsx @@ -90,21 +90,19 @@ export const CollapseContent: Component<{ return v }, []) return ( - <> - - {isOpened && ( - - {children} - - )} - - + + {isOpened && ( + + {children} + + )} + ) } diff --git a/apps/desktop/src/renderer/src/components/ui/media/preview-media.tsx b/apps/desktop/src/renderer/src/components/ui/media/preview-media.tsx index abe1ca19fd..840ae9f7a7 100644 --- a/apps/desktop/src/renderer/src/components/ui/media/preview-media.tsx +++ b/apps/desktop/src/renderer/src/components/ui/media/preview-media.tsx @@ -36,7 +36,7 @@ const Wrapper: Component<{ const [showActionOverlay, setShowActionOverlay] = useState(false) useEffect(() => { - if (!containerRef.current) { + if (!containerRef.current || !showActions) { return } const $container = containerRef.current @@ -57,7 +57,7 @@ const Wrapper: Component<{ $container.removeEventListener("mousemove", handleMouseMove) $container.removeEventListener("mouseleave", outOfContainer) } - }, [sideContent]) + }, [sideContent, showActions]) return (
void } if (!subscription) return subscriptionActions.unfollow([subscription.feedId]).then(([feed]) => { - subscriptionQuery.byView(subscription.view).invalidate() + subscriptionQuery.all().invalidate() feedUnreadActions.updateByFeedId(subscription.feedId, 0) if (!subscription) return @@ -51,7 +51,7 @@ export const useDeleteSubscription = ({ onSuccess }: { onSuccess?: () => void } }, }) - subscriptionQuery.byView(subscription.view).invalidate() + subscriptionQuery.all().invalidate() feedUnreadActions.fetchUnreadByView(subscription.view) toast.dismiss(toastId) @@ -96,15 +96,13 @@ const UnfollowInfo = ({ title, undo }: { title: string; undo: () => any }) => { preventDefault: true, }) return ( - <> - {title}, - }} - /> - + {title}, + }} + /> ) } diff --git a/apps/desktop/src/renderer/src/lib/api-fetch.ts b/apps/desktop/src/renderer/src/lib/api-fetch.ts index b86e37c60d..a3f8034f8e 100644 --- a/apps/desktop/src/renderer/src/lib/api-fetch.ts +++ b/apps/desktop/src/renderer/src/lib/api-fetch.ts @@ -12,6 +12,8 @@ import { isDev } from "~/constants" import { NeedActivationToast } from "~/modules/activation/NeedActivationToast" import { DebugRegistry } from "~/modules/debug/registry" +import { isInMAS } from "./utils" + export const apiFetch = ofetch.create({ baseURL: env.VITE_API_URL, credentials: "include", @@ -23,7 +25,10 @@ export const apiFetch = ofetch.create({ if (isDev) { header.set("X-App-Dev", "1") } - header.set("X-App-Name", "Follow Web") + header.set("X-App-Name", "Folo Web") + if (isInMAS()) { + header.set("X-MAS", "1") + } options.headers = header }, onResponse() { @@ -85,7 +90,7 @@ export const apiClient = hc(env.VITE_API_URL, { headers() { return { "X-App-Version": PKG.version, - "X-App-Name": "Follow Web", + "X-App-Name": "Folo Web", } }, }) diff --git a/apps/desktop/src/renderer/src/lib/immersive-translate.ts b/apps/desktop/src/renderer/src/lib/immersive-translate.ts index 772b8019ea..6665ed9e70 100644 --- a/apps/desktop/src/renderer/src/lib/immersive-translate.ts +++ b/apps/desktop/src/renderer/src/lib/immersive-translate.ts @@ -36,11 +36,9 @@ export function immersiveTranslate({ return } - const translation = entry.settings?.translation ?? targetLanguage - const immersiveTranslateMark = html.querySelectorAll("[data-immersive-translate-mark=true]") if (immersiveTranslateMark.length > 0) { - if (translation) { + if (targetLanguage) { return } @@ -49,7 +47,7 @@ export function immersiveTranslate({ } } - if (!translation) { + if (!targetLanguage) { return } @@ -61,7 +59,7 @@ export function immersiveTranslate({ translate({ entry, - language: translation, + language: targetLanguage, part: textNode.textContent, extraFields: ["content"], }).then((transformed) => { @@ -96,7 +94,7 @@ export function immersiveTranslate({ if (tag.textContent) { const isLanguageMatch = checkLanguage({ content: tag.textContent, - language: translation, + language: targetLanguage, }) if (isLanguageMatch) { continue @@ -151,7 +149,7 @@ export function immersiveTranslate({ translate({ entry, - language: translation, + language: targetLanguage, part: textContent, extraFields: ["content"], }).then((transformed) => { diff --git a/apps/desktop/src/renderer/src/lib/translate.ts b/apps/desktop/src/renderer/src/lib/translate.ts index bb303b4ec3..93aefdaed8 100644 --- a/apps/desktop/src/renderer/src/lib/translate.ts +++ b/apps/desktop/src/renderer/src/lib/translate.ts @@ -1,42 +1,13 @@ import { parseHtml } from "@follow/components/ui/markdown/parse-html.js" import { views } from "@follow/constants" import type { SupportedLanguages } from "@follow/models/types" +import { LANGUAGE_MAP } from "@follow/shared" import { franc } from "franc-min" import type { FlatEntryModel } from "~/store/entry" import { apiClient } from "./api-fetch" -export const LanguageMap: Record< - SupportedLanguages, - { - label: string - value: string - code: string - } -> = { - en: { - value: "en", - label: "English", - code: "eng", - }, - ja: { - value: "ja", - label: "Japanese", - code: "jpn", - }, - "zh-CN": { - value: "zh-CN", - label: "Simplified Chinese", - code: "cmn", - }, - "zh-TW": { - value: "zh-TW", - label: "Traditional Chinese (Taiwan)", - code: "cmn", - }, -} - export const checkLanguage = ({ content, language, @@ -48,10 +19,12 @@ export const checkLanguage = ({ const pureContent = parseHtml(content) .toText() .replaceAll(/https?:\/\/\S+|www\.\S+/g, " ") + const { code } = LANGUAGE_MAP[language] + if (!code) return false const sourceLanguage = franc(pureContent, { - only: [LanguageMap[language].code], + only: [code], }) - if (sourceLanguage === LanguageMap[language].code) { + if (sourceLanguage === code) { return true } else { return false diff --git a/apps/desktop/src/renderer/src/modules/action/target-action-list.tsx b/apps/desktop/src/renderer/src/modules/action/target-action-list.tsx index c4243c9054..1962546194 100644 --- a/apps/desktop/src/renderer/src/modules/action/target-action-list.tsx +++ b/apps/desktop/src/renderer/src/modules/action/target-action-list.tsx @@ -1,7 +1,6 @@ import { ActionButton, Button } from "@follow/components/ui/button/index.js" import { Divider } from "@follow/components/ui/divider/index.js" import { Input } from "@follow/components/ui/input/index.js" -import { ResponsiveSelect } from "@follow/components/ui/select/responsive.js" import { Table, TableBody, @@ -10,7 +9,7 @@ import { TableHeader, TableRow, } from "@follow/components/ui/table/index.jsx" -import type { ActionModel, SupportedLanguages } from "@follow/models/types" +import type { ActionModel } from "@follow/models/types" import { Fragment, useMemo } from "react" import { useTranslation } from "react-i18next" @@ -31,28 +30,6 @@ type Action = { onRemove: (data: ActionModel) => void } -const TransitionOptions: { - label: string - value: SupportedLanguages -}[] = [ - { - label: "English", - value: "en", - }, - { - label: "日本語", - value: "ja", - }, - { - label: "简体中文", - value: "zh-CN", - }, - { - label: "繁體中文", - value: "zh-TW", - }, -] - const AddTableRow = ({ onClick, disabled }: { onClick?: () => void; disabled?: boolean }) => { const { t } = useTranslation("settings") return ( @@ -108,26 +85,11 @@ export const TargetActionList = ({ index }: { index: number }) => { title: t("actions.action_card.translate_into"), enabled: !!translation, onInit: (data) => { - data.result.translation = "zh-CN" + data.result.translation = true }, onRemove: (data) => { delete data.result.translation }, - config: () => ( - { - onChange((data) => { - data.result.translation = value - }) - }} - items={TransitionOptions} - triggerClassName="w-fit max-w-44 text-sm" - /> - ), - configInline: true, }, { title: t("actions.action_card.enable_readability"), diff --git a/apps/desktop/src/renderer/src/modules/ai/ai-daily/daily.tsx b/apps/desktop/src/renderer/src/modules/ai/ai-daily/daily.tsx index 5c5bd4be80..09714ded81 100644 --- a/apps/desktop/src/renderer/src/modules/ai/ai-daily/daily.tsx +++ b/apps/desktop/src/renderer/src/modules/ai/ai-daily/daily.tsx @@ -267,7 +267,7 @@ const createRelatedEntryLink = (variant: "toast" | "modal") => (props: LinkProps autoFocus: false, modalClassName: "relative mx-auto mt-[10vh] scrollbar-none max-w-full overflow-auto px-2 lg:max-w-[65rem] lg:p-0", - // eslint-disable-next-line @eslint-react/no-nested-components + // eslint-disable-next-line @eslint-react/no-nested-component-definitions CustomModalComponent: ({ children }) => { const { feedId } = useEntry(entryId) || {} return {children} diff --git a/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.shared.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.shared.tsx index 2e487c5513..ada9cf4e9f 100644 --- a/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.shared.tsx +++ b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.shared.tsx @@ -1,5 +1,6 @@ import { cn } from "@follow/utils/utils" import { lazy, Suspense, useEffect, useState } from "react" +import { useTranslation } from "react-i18next" import { toast } from "sonner" import { useWhoami } from "~/atoms/user" @@ -21,7 +22,9 @@ export function NewUserGuide() { useEffect(() => { if (user?.email && !user.emailVerified) { toast.error(, { + id: "email-verification", duration: Infinity, + closeButton: true, }) } }, [user?.emailVerified]) @@ -40,10 +43,15 @@ function EmailVerificationToast({ email: string } }) { + const { t } = useTranslation("settings") const [isEmailVerificationSent, setIsEmailVerificationSent] = useState(false) return (
-
Please verify your email ({user.email}) to continue
+
+ {t("profile.email.verify_email", { + email_address: user.email, + })} +
) diff --git a/apps/desktop/src/renderer/src/modules/app-layout/subview/index.electron.tsx b/apps/desktop/src/renderer/src/modules/app-layout/subview/index.electron.tsx index bfd17ec991..7b31bb99a0 100644 --- a/apps/desktop/src/renderer/src/modules/app-layout/subview/index.electron.tsx +++ b/apps/desktop/src/renderer/src/modules/app-layout/subview/index.electron.tsx @@ -65,7 +65,11 @@ export function SubviewLayout() { > { - navigate(prevLocation) + if (prevLocation.pathname === location.pathname) { + navigate({ pathname: "" }) + } else { + navigate(prevLocation) + } }} className="no-drag-region hover:text-accent inline-flex items-center gap-1 duration-200" > diff --git a/apps/desktop/src/renderer/src/modules/auth/Form.tsx b/apps/desktop/src/renderer/src/modules/auth/Form.tsx index 8e3bcc8923..af750617a3 100644 --- a/apps/desktop/src/renderer/src/modules/auth/Form.tsx +++ b/apps/desktop/src/renderer/src/modules/auth/Form.tsx @@ -133,6 +133,7 @@ export function LoginWithPassword({ runtime }: { runtime: LoginRuntime }) { {t("login.continueWith", { provider: t("words.email") })} -
- - - + )} + ( + + {t("discover.inbox_title")} + + + + + + )} + /> +
+ +
+ + ) } diff --git a/apps/desktop/src/renderer/src/modules/discover/list-form.tsx b/apps/desktop/src/renderer/src/modules/discover/list-form.tsx index d40243afe6..25c55d631c 100644 --- a/apps/desktop/src/renderer/src/modules/discover/list-form.tsx +++ b/apps/desktop/src/renderer/src/modules/discover/list-form.tsx @@ -225,13 +225,12 @@ const ListInnerForm = ({ }, onSuccess: (_, variables) => { if (isSubscribed && variables.view !== `${subscription?.view}`) { - subscriptionQuery.byView(subscription?.view).invalidate() - tipcClient?.invalidateQuery(subscriptionQuery.byView(subscription?.view).key) feedUnreadActions.fetchUnreadByView(subscription?.view) + } else { + feedUnreadActions.fetchUnreadByView(Number.parseInt(variables.view)) } - subscriptionQuery.byView(Number.parseInt(variables.view)).invalidate() - tipcClient?.invalidateQuery(subscriptionQuery.byView(Number.parseInt(variables.view)).key) - feedUnreadActions.fetchUnreadByView(Number.parseInt(variables.view)) + subscriptionQuery.all().invalidate() + tipcClient?.invalidateQuery(subscriptionQuery.all().key) const listId = list.id if (listId) { diff --git a/apps/desktop/src/renderer/src/modules/discover/recommendations.tsx b/apps/desktop/src/renderer/src/modules/discover/recommendations.tsx index dc98204e2d..02f95cd0f8 100644 --- a/apps/desktop/src/renderer/src/modules/discover/recommendations.tsx +++ b/apps/desktop/src/renderer/src/modules/discover/recommendations.tsx @@ -162,7 +162,7 @@ export function Recommendations({
diff --git a/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-masonry.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-masonry.tsx index bd42c1020a..2ddaaf46ba 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-masonry.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-masonry.tsx @@ -27,7 +27,7 @@ import { } from "react" import { useEventCallback } from "usehooks-ts" -import { useGeneralSettingKey } from "~/atoms/settings/general" +import { useActionLanguage, useGeneralSettingKey } from "~/atoms/settings/general" import { MediaContainerWidthProvider } from "~/components/ui/media" import { useAuthQuery } from "~/hooks/common/useBizQuery" import { Queries } from "~/queries" @@ -248,11 +248,12 @@ const MasonryRender: React.ComponentType< > = ({ data, index }) => { const firstScreenReady = useContext(FirstScreenReadyContext) const entry = useEntry(data.entryId) + const actionLanguage = useActionLanguage() const translation = useAuthQuery( Queries.ai.translation({ entry: entry!, view: entry?.view, - language: entry?.settings?.translation, + language: actionLanguage, }), { enabled: !!entry?.settings?.translation, diff --git a/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx index e785050542..236024e74f 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx @@ -137,7 +137,12 @@ const ActionBar = ({ entryId }: { entryId: string }) => { (item) => item.id !== COMMAND_ID.entry.read && item.id !== COMMAND_ID.entry.openInBrowser, ) .map((item) => ( - + ))}
) diff --git a/apps/desktop/src/renderer/src/modules/entry-column/index.tsx b/apps/desktop/src/renderer/src/modules/entry-column/index.tsx index 4cac1879cb..665f8e0b14 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/index.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/index.tsx @@ -129,9 +129,10 @@ function EntryColumnImpl() { }) } > - {entriesIds.length === 0 && !entries.isLoading && !entries.error && feed?.type === "feed" && ( - - )} + {entriesIds.length === 0 && + !entries.isLoading && + !entries.error && + (!feed || feed?.type === "feed") && } = memo(({ view, count }) => { +}> = memo(({ view, count = 10 }) => { const SkeletonItem = getSkeletonItemComponentByView(view) + + if (!SkeletonItem) { + return LoadingCircleFallback + } + if (count === 1) { return SkeletonItem } - return SkeletonItem ? ( + return (
- {SkeletonItem} - {SkeletonItem} - {SkeletonItem} - {SkeletonItem} - {SkeletonItem} - {SkeletonItem} - {SkeletonItem} - {SkeletonItem} - {SkeletonItem} - {SkeletonItem} + {Array.from({ length: count }).map((_, index) => ( + // eslint-disable-next-line @eslint-react/no-array-index-key -- index is unique +
{SkeletonItem}
+ ))}
- ) : ( - LoadingCircleFallback ) }) diff --git a/apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx b/apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx index 1e9c7a3062..00f5efff44 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx @@ -1,6 +1,6 @@ import { useMobile } from "@follow/components/hooks/useMobile.js" import { EllipsisHorizontalTextWithTooltip } from "@follow/components/ui/typography/index.js" -import { clsx, cn, formatEstimatedMins, isSafari } from "@follow/utils/utils" +import { clsx, cn, formatEstimatedMins, formatTimeToSeconds, isSafari } from "@follow/utils/utils" import { useMemo } from "react" import { AudioPlayer, useAudioPlayerAtomSelector } from "~/atoms/player" @@ -79,6 +79,10 @@ export function ListItem({ } }, [settingWideMode]) + const audioAttachment = useMemo(() => { + return entry?.entries?.attachments?.find((a) => a.mime_type?.startsWith("audio") && a.url) + }, [entry?.entries?.attachments]) + // NOTE: prevent 0 height element, react virtuoso will not stop render any more if (!entry || !(feed || inbox)) return null @@ -86,10 +90,7 @@ export function ListItem({ const related = feed || inbox - const hasAudio = simple - ? false - : !!entry.entries?.attachments?.[0]?.url && - entry.entries?.attachments?.[0]?.mime_type?.startsWith("audio") + const hasAudio = simple ? false : !!audioAttachment const hasMedia = simple ? false : !!entry.entries?.media?.[0]?.url const marginWidth = 8 * (isMobile ? 1.125 : 1) @@ -175,7 +176,7 @@ export function ListItem({ )} > @@ -186,11 +187,8 @@ export function ListItem({ {hasAudio && ( ) => { if (isMobile) e.stopPropagation() diff --git a/apps/desktop/src/renderer/src/modules/entry-column/translation.tsx b/apps/desktop/src/renderer/src/modules/entry-column/translation.tsx index fecb5c5bdb..f342ea6dac 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/translation.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/translation.tsx @@ -41,17 +41,15 @@ export const EntryTranslation: Component<{ ) : ( - <> -
- {nextTarget && ( - <> - {nextTarget} - - - )} - {source} -
- +
+ {nextTarget && ( + <> + {nextTarget} + + + )} + {source} +
)} ) diff --git a/apps/desktop/src/renderer/src/modules/entry-content/actions/more-actions.tsx b/apps/desktop/src/renderer/src/modules/entry-content/actions/more-actions.tsx index ea3688859a..d10712d2a5 100644 --- a/apps/desktop/src/renderer/src/modules/entry-content/actions/more-actions.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/actions/more-actions.tsx @@ -11,11 +11,17 @@ import { } from "~/components/ui/dropdown-menu/dropdown-menu" import { useSortedEntryActions } from "~/hooks/biz/useEntryActions" import { COMMAND_ID } from "~/modules/command/commands/id" -import { useCommand } from "~/modules/command/hooks/use-command" +import { hasCommand, useCommand } from "~/modules/command/hooks/use-command" import type { FollowCommandId } from "~/modules/command/types" export const MoreActions = ({ entryId, view }: { entryId: string; view?: FeedViewType }) => { - const { moreAction: actionConfigs } = useSortedEntryActions({ entryId, view }) + const { moreAction } = useSortedEntryActions({ entryId, view }) + + const actionConfigs = useMemo( + () => moreAction.filter((action) => hasCommand(action.id)), + [moreAction], + ) + const availableActions = useMemo( () => actionConfigs.filter((item) => item.id !== COMMAND_ID.settings.customizeToolbar), [actionConfigs], @@ -26,7 +32,7 @@ export const MoreActions = ({ entryId, view }: { entryId: string; view?: FeedVie [actionConfigs], ) - if (availableActions.length === 0) { + if (availableActions.length === 0 && extraAction.length === 0) { return null } @@ -44,7 +50,7 @@ export const MoreActions = ({ entryId, view }: { entryId: string; view?: FeedVie active={config.active} /> ))} - + {availableActions.length > 0 && } {extraAction.map((config) => ( { }, [entry?.entries.authorUrl, entry?.entries.url, feed?.siteUrl, feed?.type, inbox]) const showAITranslation = useShowAITranslation() || !!entry?.settings?.translation - const translationLanguage = useGeneralSettingSelector((s) => s.translationLanguage) + const actionLanguage = useActionLanguage() const translation = useAuthQuery( Queries.ai.translation({ entry: entry!, - language: entry?.settings?.translation || (translationLanguage as SupportedLanguages), + language: actionLanguage, extraFields: ["title"], }), { diff --git a/apps/desktop/src/renderer/src/modules/entry-content/components/SourceContentView.tsx b/apps/desktop/src/renderer/src/modules/entry-content/components/SourceContentView.tsx index b0dc9834ea..c2041b8f94 100644 --- a/apps/desktop/src/renderer/src/modules/entry-content/components/SourceContentView.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/components/SourceContentView.tsx @@ -37,30 +37,28 @@ export const SourceContentView = ({ src }: { src: string }) => { }, [src, showSourceContent]) return ( - <> -
- {loading && ( -
- -
- )} - + {loading && ( +
+ +
+ )} + + - setLoading(false)} - /> - -
- + src={src} + sandbox="allow-scripts allow-same-origin" + // For iframe + onLoad={() => setLoading(false)} + /> + + ) } diff --git a/apps/desktop/src/renderer/src/modules/entry-content/components/WarnGoToExternalLink.tsx b/apps/desktop/src/renderer/src/modules/entry-content/components/WarnGoToExternalLink.tsx index af4ef795d8..1e198f366d 100644 --- a/apps/desktop/src/renderer/src/modules/entry-content/components/WarnGoToExternalLink.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/components/WarnGoToExternalLink.tsx @@ -6,7 +6,7 @@ import { parseSafeUrl } from "@follow/utils/utils" import { Label } from "@radix-ui/react-label" import { PopoverPortal } from "@radix-ui/react-popover" import { atomWithStorage } from "jotai/utils" -import { forwardRef, Fragment, useState } from "react" +import { forwardRef, useState } from "react" import { useGeneralSettingKey, useGeneralSettingValue } from "~/atoms/settings/general" import { jotaiStore } from "~/lib/jotai" @@ -87,33 +87,31 @@ const WarnGoToExternalLinkImpl = forwardRef< } } return ( - - !v && setOpen(false)}> - - - - - -

- You are about to leave this site to go to an external page, do you trust this URL and - go to it? -

-

{rest.href}

+ !v && setOpen(false)}> + + + + + +

+ You are about to leave this site to go to an external page, do you trust this URL and go + to it? +

+

{rest.href}

-
- +
+ - } onClick={handleGo}> - Go - -
- - - - + } onClick={handleGo}> + Go + +
+ + + ) }) diff --git a/apps/desktop/src/renderer/src/modules/entry-content/index.electron.tsx b/apps/desktop/src/renderer/src/modules/entry-content/index.electron.tsx index 8427461966..d9dc12eebf 100644 --- a/apps/desktop/src/renderer/src/modules/entry-content/index.electron.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/index.electron.tsx @@ -1,7 +1,7 @@ import { MemoedDangerousHTMLStyle } from "@follow/components/common/MemoedDangerousHTMLStyle.js" import { ScrollArea } from "@follow/components/ui/scroll-area/index.js" import { useTitle } from "@follow/hooks" -import type { FeedModel, InboxModel, SupportedLanguages } from "@follow/models/types" +import type { FeedModel, InboxModel } from "@follow/models/types" import { IN_ELECTRON } from "@follow/shared/constants" import { stopPropagation } from "@follow/utils/dom" import { cn } from "@follow/utils/utils" @@ -11,7 +11,7 @@ import { useEffect, useMemo, useRef } from "react" import { useShowAITranslation } from "~/atoms/ai-translation" import { useEntryIsInReadability } from "~/atoms/readability" -import { useGeneralSettingSelector } from "~/atoms/settings/general" +import { useActionLanguage } from "~/atoms/settings/general" import { useUISettingKey } from "~/atoms/settings/ui" import { ShadowDOM } from "~/components/common/ShadowDOM" import { useInPeekModal } from "~/components/ui/modal/inspire/PeekModal" @@ -117,9 +117,7 @@ export const EntryContent: Component = ({ ) const customCSS = useUISettingKey("customCSS") const showAITranslation = useShowAITranslation() - const translationLanguage = useGeneralSettingSelector( - (s) => s.translationLanguage, - ) as SupportedLanguages + const actionLanguage = useActionLanguage() if (!entry) return null @@ -131,8 +129,7 @@ export const EntryContent: Component = ({ const fullText = html.textContent ?? "" if (!fullText) return - const translation = - entry.settings?.translation ?? (showAITranslation ? translationLanguage : undefined) + const translation = showAITranslation ? actionLanguage : undefined if (translation) { const isLanguageMatch = checkLanguage({ @@ -148,7 +145,7 @@ export const EntryContent: Component = ({ immersiveTranslate({ html, entry, - targetLanguage: translation as SupportedLanguages, + targetLanguage: translation, cache: { get: (key: string) => getTranslationCache()[key], set: (key: string, value: string) => diff --git a/apps/desktop/src/renderer/src/modules/entry-content/index.mobile.tsx b/apps/desktop/src/renderer/src/modules/entry-content/index.mobile.tsx index 013fefcf01..88be73b4d4 100644 --- a/apps/desktop/src/renderer/src/modules/entry-content/index.mobile.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/index.mobile.tsx @@ -1,7 +1,7 @@ import { MemoedDangerousHTMLStyle } from "@follow/components/common/MemoedDangerousHTMLStyle.js" import { ScrollElementContext } from "@follow/components/ui/scroll-area/ctx.js" import { useTitle } from "@follow/hooks" -import type { FeedModel, InboxModel, SupportedLanguages } from "@follow/models/types" +import type { FeedModel, InboxModel } from "@follow/models/types" import { nextFrame, stopPropagation } from "@follow/utils/dom" import { cn } from "@follow/utils/utils" import { ErrorBoundary } from "@sentry/react" @@ -9,7 +9,7 @@ import { useEffect, useMemo, useState } from "react" import { useShowAITranslation } from "~/atoms/ai-translation" import { useAudioPlayerAtomSelector } from "~/atoms/player" -import { useGeneralSettingSelector } from "~/atoms/settings/general" +import { useActionLanguage } from "~/atoms/settings/general" import { useUISettingKey } from "~/atoms/settings/ui" import { ShadowDOM } from "~/components/common/ShadowDOM" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" @@ -104,9 +104,7 @@ export const EntryContent: Component<{ const customCSS = useUISettingKey("customCSS") const showAITranslation = useShowAITranslation() - const translationLanguage = useGeneralSettingSelector( - (s) => s.translationLanguage, - ) as SupportedLanguages + const actionLanguage = useActionLanguage() const contentLineHeight = useUISettingKey("contentLineHeight") const contentFontSize = useUISettingKey("contentFontSize") @@ -134,8 +132,7 @@ export const EntryContent: Component<{ const fullText = html.textContent ?? "" if (!fullText) return - const translation = - entry.settings?.translation ?? (showAITranslation ? translationLanguage : undefined) + const translation = showAITranslation ? actionLanguage : undefined if (translation) { const isLanguageMatch = checkLanguage({ @@ -151,7 +148,7 @@ export const EntryContent: Component<{ immersiveTranslate({ html, entry, - targetLanguage: translation as SupportedLanguages, + targetLanguage: translation, cache: { get: (key: string) => getTranslationCache()[key], set: (key: string, value: string) => diff --git a/apps/desktop/src/renderer/src/modules/entry-content/index.shared.tsx b/apps/desktop/src/renderer/src/modules/entry-content/index.shared.tsx index 9ad0a39a80..13b56ccce9 100644 --- a/apps/desktop/src/renderer/src/modules/entry-content/index.shared.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/index.shared.tsx @@ -21,6 +21,7 @@ import { useEntryInReadabilityStatus, useEntryReadabilityContent, } from "~/atoms/readability" +import { useActionLanguage } from "~/atoms/settings/general" import { enableShowSourceContent } from "~/atoms/source-content" import { CopyButton } from "~/components/ui/button/CopyButton" import { Toc } from "~/components/ui/markdown/components/Toc" @@ -319,10 +320,11 @@ export function AISummary({ entryId }: { entryId: string }) { const { t } = useTranslation() const entry = useEntry(entryId) const showAISummary = useShowAISummary() || !!entry?.settings?.summary + const actionLanguage = useActionLanguage() const summary = useAuthQuery( Queries.ai.summary({ entryId, - language: entry?.settings?.translation, + language: actionLanguage, }), { enabled: showAISummary, diff --git a/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx b/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx index 2f19a214d7..ef712cb561 100644 --- a/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx +++ b/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx @@ -244,7 +244,7 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) { }} variant={"outline"} > - Back + {t.app("new_user_guide.actions.back")} )} diff --git a/apps/desktop/src/renderer/src/modules/panel/cmdf.tsx b/apps/desktop/src/renderer/src/modules/panel/cmdf.tsx index c5364d61ce..d03d5812c0 100644 --- a/apps/desktop/src/renderer/src/modules/panel/cmdf.tsx +++ b/apps/desktop/src/renderer/src/modules/panel/cmdf.tsx @@ -1,6 +1,6 @@ /** * @see https://github.com/toeverything/AFFiNE/blob/98e35384a6f71bf64c668b8f13afcaf28c9b8e97/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx - * @copyright AFFiNE, Follow + * @copyright AFFiNE, Folo */ import { RootPortal } from "@follow/components/ui/portal/index.jsx" import { useInputComposition, useRefValue } from "@follow/hooks" diff --git a/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx b/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx index 73fdc25372..fba486dc47 100644 --- a/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx +++ b/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx @@ -175,7 +175,7 @@ const SubscriptionItem: FC<{ ) : ( <> - {APP_NAME} + {t("feed_form.follow")} )} diff --git a/apps/desktop/src/renderer/src/modules/settings/tabs/general.tsx b/apps/desktop/src/renderer/src/modules/settings/tabs/general.tsx index 4c1018355b..7e3394b650 100644 --- a/apps/desktop/src/renderer/src/modules/settings/tabs/general.tsx +++ b/apps/desktop/src/renderer/src/modules/settings/tabs/general.tsx @@ -1,6 +1,7 @@ import { useMobile } from "@follow/components/hooks/useMobile.js" import { ResponsiveSelect } from "@follow/components/ui/select/responsive.js" import { useTypeScriptHappyCallback } from "@follow/hooks" +import { LANGUAGE_MAP } from "@follow/shared" import { IN_ELECTRON } from "@follow/shared/constants" import { cn } from "@follow/utils/utils" import { useQuery } from "@tanstack/react-query" @@ -13,6 +14,7 @@ import { currentSupportedLanguages } from "~/@types/constants" import { defaultResources } from "~/@types/default-resource" import { langLoadingLockMapAtom } from "~/atoms/lang" import { + DEFAULT_ACTION_LANGUAGE, setGeneralSetting, useGeneralSettingKey, useGeneralSettingSelector, @@ -22,7 +24,6 @@ import { useProxyValue, useSetProxy } from "~/hooks/biz/useProxySetting" import { useMinimizeToTrayValue, useSetMinimizeToTray } from "~/hooks/biz/useTraySetting" import { fallbackLanguage } from "~/i18n" import { tipcClient } from "~/lib/client" -import { LanguageMap } from "~/lib/translate" import { setTranslationCache } from "~/modules/entry-content/atoms" import { SettingDescription, SettingInput, SettingSwitch } from "../control" @@ -68,7 +69,7 @@ export const SettingGeneral = () => { IN_ELECTRON && MinimizeToTraySetting, isMobile && StartupScreenSelector, LanguageSelector, - TranslateLanguageSelector, + ActionLanguageSelector, { type: "title", @@ -243,23 +244,31 @@ export const LanguageSelector = ({ ) } -const TranslateLanguageSelector = () => { +const ActionLanguageSelector = () => { const { t } = useTranslation("settings") - const translationLanguage = useGeneralSettingKey("translationLanguage") + const actionLanguage = useGeneralSettingKey("actionLanguage") return (
- {t("general.translation_language")} +
+ {t("general.action_language.label")} + + {t("general.action_language.description")} + +
{ - setGeneralSetting("translationLanguage", value) + setGeneralSetting("actionLanguage", value) setTranslationCache({}) }} - items={Object.values(LanguageMap)} + items={[ + { label: t("general.action_language.default"), value: DEFAULT_ACTION_LANGUAGE }, + ...Object.values(LANGUAGE_MAP), + ]} />
) diff --git a/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx b/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx index c0cfdeb433..cdb2a2983a 100644 --- a/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx +++ b/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx @@ -1,11 +1,12 @@ import { Card, CardContent, CardHeader } from "@follow/components/ui/card/index.jsx" -import { views } from "@follow/constants" +import { FeedViewType, views } from "@follow/constants" import type { EntryModelSimple, FeedModel } from "@follow/models" import { cn } from "@follow/utils/utils" import { cloneElement, forwardRef } from "react" import { useI18n } from "~/hooks/common" +import { EntryItemSkeleton } from "../entry-column/item" import { EntryItemStateless } from "../entry-column/item-stateless" export const ViewSelectorRadioGroup = forwardRef< @@ -50,12 +51,14 @@ export const ViewSelectorRadioGroup = forwardRef< ))} - {!!feed && !!entries && ( + {!!feed && !!entries ? ( {entries.slice(0, 2).map((entry) => ( ))} + ) : ( + )} ) diff --git a/apps/desktop/src/renderer/src/modules/timeline-column/CategoryRenameContent.tsx b/apps/desktop/src/renderer/src/modules/timeline-column/CategoryRenameContent.tsx index 34082c8ce3..3277ce4ec5 100644 --- a/apps/desktop/src/renderer/src/modules/timeline-column/CategoryRenameContent.tsx +++ b/apps/desktop/src/renderer/src/modules/timeline-column/CategoryRenameContent.tsx @@ -25,12 +25,10 @@ export function CategoryRenameContent({ feedIdList, onSuccess, category, - view, }: { feedIdList: string[] onSuccess?: () => void category: string - view?: number }) { const form = useForm>({ resolver: zodResolver(formSchema), @@ -48,7 +46,7 @@ export function CategoryRenameContent({ }, }), onSuccess: () => { - Queries.subscription.byView(view).invalidate() + Queries.subscription.all().invalidate() onSuccess?.() }, diff --git a/apps/desktop/src/renderer/src/modules/timeline-column/FeedList.shared.tsx b/apps/desktop/src/renderer/src/modules/timeline-column/FeedList.shared.tsx index dae16abe68..c6cb58263f 100644 --- a/apps/desktop/src/renderer/src/modules/timeline-column/FeedList.shared.tsx +++ b/apps/desktop/src/renderer/src/modules/timeline-column/FeedList.shared.tsx @@ -26,7 +26,7 @@ import { feedColumnStyles } from "./styles" import { UnreadNumber } from "./UnreadNumber" export const ListHeader = ({ view }: { view: number }) => { - useAuthQuery(Queries.subscription.byView()) + useAuthQuery(Queries.subscription.all()) useAuthQuery(Queries.subscription.unreadAll(), { refetchInterval: false, }) diff --git a/apps/desktop/src/renderer/src/modules/timeline-column/index.tsx b/apps/desktop/src/renderer/src/modules/timeline-column/index.tsx index abbdab8260..bd5d0c0695 100644 --- a/apps/desktop/src/renderer/src/modules/timeline-column/index.tsx +++ b/apps/desktop/src/renderer/src/modules/timeline-column/index.tsx @@ -55,7 +55,7 @@ export function FeedColumn({ children, className }: PropsWithChildren<{ classNam listId: s.listId, })) - const [timelineId, setMemoizedTimelineId] = useState(routeParams.timelineId) + const [timelineId, setMemoizedTimelineId] = useState(routeParams.timelineId ?? timelineList[0]) useEffect(() => { if (routeParams.timelineId) setMemoizedTimelineId(routeParams.timelineId) diff --git a/apps/desktop/src/renderer/src/modules/user/ProfileButton.electron.tsx b/apps/desktop/src/renderer/src/modules/user/ProfileButton.electron.tsx index 1f05174245..8b67cc4d1b 100644 --- a/apps/desktop/src/renderer/src/modules/user/ProfileButton.electron.tsx +++ b/apps/desktop/src/renderer/src/modules/user/ProfileButton.electron.tsx @@ -70,148 +70,146 @@ export const ProfileButton: FC = memo((props) => { } return ( - <> - - - {props.animatedAvatar ? ( - - ) : ( - - )} - + + + {props.animatedAvatar ? ( + + ) : ( + + )} + - + + + + + { + navigate("/power") + }} > - -
- - {user?.name} - - {!!user?.handle && ( - - - @{user.handle} - - - )} -
- +
+ + + +
+ - { - navigate("/power") - }} - > -
- - - -
- + - + { + presentUserProfile(user?.id) + }} + icon={} + > + {t("user_button.profile")} + - { - presentUserProfile(user?.id) - }} - icon={} - > - {t("user_button.profile")} - + { + if (role !== UserRole.Trial) { + presentAchievement() + } else { + presentActivationModal() + } + }} + icon={} + > + {t("user_button.achievement")} + + + + {!zenModeSetting && ( { - if (role !== UserRole.Trial) { - presentAchievement() - } else { - presentActivationModal() - } + setZenMode(true) }} - icon={} + icon={} > - {t("user_button.achievement")} + {t("user_button.zen_mode")} + )} + { + navigate("/action") + }} + icon={} + > + {t("words.actions")} + + { + navigate("/rsshub") + }} + icon={} + > + {t("words.rsshub")} + - - - {!zenModeSetting && ( + + { + settingModalPresent() + }} + icon={} + > + {t("user_button.preferences")} + + + {!window.electron && ( + <> { - setZenMode(true) + window.open(`${repository.url}/releases`) }} - icon={} + icon={} > - {t("user_button.zen_mode")} + {t("user_button.download_desktop_app")} - )} - { - navigate("/action") - }} - icon={} - > - {t("words.actions")} - - { - navigate("/rsshub") - }} - icon={} - > - {t("words.rsshub")} - - - - { - settingModalPresent() - }} - icon={} - > - {t("user_button.preferences")} - - - {!window.electron && ( - <> - { - window.open(`${repository.url}/releases`) - }} - icon={} - > - {t("user_button.download_desktop_app")} - - - - )} - } - > - {t("user_button.log_out")} - - - - + + + )} + } + > + {t("user_button.log_out")} + + + ) }) ProfileButton.displayName = "ProfileButton" diff --git a/apps/desktop/src/renderer/src/queries/subscriptions.ts b/apps/desktop/src/renderer/src/queries/subscriptions.ts index 327f6eaaa9..ad0347aea3 100644 --- a/apps/desktop/src/renderer/src/queries/subscriptions.ts +++ b/apps/desktop/src/renderer/src/queries/subscriptions.ts @@ -1,13 +1,11 @@ -import type { FeedViewType } from "@follow/constants" - import { apiClient } from "~/lib/api-fetch" import { defineQuery } from "~/lib/defineQuery" import { subscriptionActions } from "~/store/subscription" import { feedUnreadActions } from "~/store/unread" export const subscription = { - byView: (view?: FeedViewType) => - defineQuery(["subscriptions", view], async () => subscriptionActions.fetchByView(view), { + all: () => + defineQuery(["subscriptions"], async () => subscriptionActions.fetchByView(), { rootKey: ["subscriptions"], }), categories: (view?: number) => diff --git a/apps/desktop/src/renderer/src/queries/users.ts b/apps/desktop/src/renderer/src/queries/users.ts index aba7b1ab9b..774b72250c 100644 --- a/apps/desktop/src/renderer/src/queries/users.ts +++ b/apps/desktop/src/renderer/src/queries/users.ts @@ -3,6 +3,7 @@ import { useQuery } from "@tanstack/react-query" import { apiClient } from "~/lib/api-fetch" import { getProviders } from "~/lib/auth" import { defineQuery } from "~/lib/defineQuery" +import { isInMAS } from "~/lib/utils" export const users = { profile: ({ userId }: { userId: string }) => @@ -23,6 +24,11 @@ export interface AuthProvider { export const useAuthProviders = () => { return useQuery({ queryKey: ["providers"], - queryFn: async () => (await getProviders()).data as Record, + queryFn: async () => + ( + await getProviders(undefined, { + headers: isInMAS() ? { "X-MAS": "1" } : undefined, + }) + ).data as Record, }) } diff --git a/apps/desktop/src/renderer/src/store/subscription/store.ts b/apps/desktop/src/renderer/src/store/subscription/store.ts index 7635fb89db..512f67da44 100644 --- a/apps/desktop/src/renderer/src/store/subscription/store.ts +++ b/apps/desktop/src/renderer/src/store/subscription/store.ts @@ -183,7 +183,7 @@ class SubscriptionActions { listActions.upsertMany(lists) inboxActions.upsertMany(inboxes) - return res.data + return null } upsertMany(subscriptions: SubscriptionFlatModel[]) { @@ -409,10 +409,14 @@ class SubscriptionActions { await tx.run() } - // TODO - async unfollow(feedIds: string[]) { - // const feed = getFeedById(feedId) - const feeds = feedIds.map((feedId) => getFeedById(feedId)) + /** + * unfollow feed or list + */ + async unfollow(feedIds?: string[]) { + if (!feedIds || feedIds.length === 0) return [] + + const feedsAndLists = feedIds.map((id) => getFeedById(id) ?? getListById(id)) + const tx = createTransaction< ReturnType, { @@ -481,15 +485,35 @@ class SubscriptionActions { } }) tx.execute(async () => { - await apiClient.subscriptions.$delete({ - json: { + let args: Parameters[0]["json"] = {} + + if (feedIds.length === 1) { + const subscription = feedsAndLists[0] + if (!subscription) return + + if (subscription.type === "list") { + args = { + listId: feedIds[0], + } + } else if (subscription.type === "feed") { + args = { + feedId: feedIds[0], + } + } + } else { + // TODO: unfollow many lists when we have the API and UI for it + args = { feedIdList: feedIds, - }, + } + } + + await apiClient.subscriptions.$delete({ + json: args, }) }) await tx.run() - return feeds + return feedsAndLists } async changeCategoryView( diff --git a/apps/desktop/src/renderer/src/styles/main.css b/apps/desktop/src/renderer/src/styles/main.css index 2df4519516..0ca4475ed1 100644 --- a/apps/desktop/src/renderer/src/styles/main.css +++ b/apps/desktop/src/renderer/src/styles/main.css @@ -2,3 +2,13 @@ @import "./additional.css"; @import "./scrollbar.css"; @import "./cursor.css"; + +@media print { + * { + overflow: visible !important; + page-break-after: avoid; + page-break-before: avoid; + break-inside: avoid; + height: max-content; + } +} diff --git a/apps/desktop/src/renderer/src/wdyr.ts b/apps/desktop/src/renderer/src/wdyr.ts index 958555e6d8..e571c807e7 100644 --- a/apps/desktop/src/renderer/src/wdyr.ts +++ b/apps/desktop/src/renderer/src/wdyr.ts @@ -7,5 +7,5 @@ if (import.meta.env.DEV) { trackAllPureComponents: true, }) const { scan } = await import("react-scan") - scan({ enabled: true, log: true, showToolbar: true }) + scan({ enabled: true, log: false, showToolbar: true }) } diff --git a/apps/desktop/static/appx/SampleAppx.150x150.png b/apps/desktop/static/appx/SampleAppx.150x150.png new file mode 100644 index 0000000000..f1e367afef Binary files /dev/null and b/apps/desktop/static/appx/SampleAppx.150x150.png differ diff --git a/apps/desktop/static/appx/SampleAppx.310x150.png b/apps/desktop/static/appx/SampleAppx.310x150.png new file mode 100644 index 0000000000..013307fe7d Binary files /dev/null and b/apps/desktop/static/appx/SampleAppx.310x150.png differ diff --git a/apps/desktop/static/appx/SampleAppx.44x44.png b/apps/desktop/static/appx/SampleAppx.44x44.png new file mode 100644 index 0000000000..a507b94c28 Binary files /dev/null and b/apps/desktop/static/appx/SampleAppx.44x44.png differ diff --git a/apps/desktop/static/appx/SampleAppx.50x50.png b/apps/desktop/static/appx/SampleAppx.50x50.png new file mode 100644 index 0000000000..35c82ff0e1 Binary files /dev/null and b/apps/desktop/static/appx/SampleAppx.50x50.png differ diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts index df06211f0d..cb364ed530 100644 --- a/apps/desktop/vite.config.ts +++ b/apps/desktop/vite.config.ts @@ -160,7 +160,7 @@ export default ({ mode }) => { manifest: { theme_color: "#000000", - name: "Follow", + name: "Folo", display: "standalone", background_color: "#ffffff", icons: [ @@ -289,7 +289,7 @@ export default ({ mode }) => { function checkBrowserSupport() { if (!("findLastIndex" in Array.prototype) || !("structuredClone" in window)) { window.alert( - "Follow is not compatible with your browser because your browser version is too old. You can download and use the Follow app or continue using it with the latest browser.", + "Folo is not compatible with your browser because your browser version is too old. You can download and use the Folo app or continue using it with the latest browser.", ) window.location.href = "https://follow.is/download" diff --git a/apps/mobile/README.md b/apps/mobile/README.md index b3432ef94c..bbadcc9024 100644 --- a/apps/mobile/README.md +++ b/apps/mobile/README.md @@ -1,6 +1,6 @@ -# Follow Mobile App 📱 +# Folo Mobile App 📱 -This is the mobile client for [Follow](https://app.follow.is), built with [Expo](https://expo.dev). Follow organizes content into one timeline, keeping you updated on what matters, noise-free. +This is the mobile client for [Folo](https://app.follow.is), built with [Expo](https://expo.dev). Folo organizes content into one timeline, keeping you updated on what matters, noise-free. ## Features diff --git a/apps/mobile/app.config.ts b/apps/mobile/app.config.ts index 674c8576cb..58df4451f4 100644 --- a/apps/mobile/app.config.ts +++ b/apps/mobile/app.config.ts @@ -25,7 +25,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ policy: "appVersion", }, - name: "Follow", + name: "Folo", slug: "follow", version: PKG.version, orientation: "portrait", @@ -53,11 +53,11 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ }, googleServicesFile: "./build/google-services.json", }, - web: { - bundler: "metro", - output: "static", - favicon: iconPath, - }, + // web: { + // bundler: "metro", + // output: "static", + // favicon: iconPath, + // }, plugins: [ [ "expo-document-picker", @@ -66,12 +66,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ }, ], "expo-localization", - [ - "expo-router", - { - root: "./src/screens", - }, - ], + [ "expo-splash-screen", { @@ -86,6 +81,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ { ios: { useFrameworks: "static", + deploymentTarget: "17.0", }, }, ], diff --git a/apps/mobile/eas.json b/apps/mobile/eas.json index 084e6fcf79..e8c595c571 100644 --- a/apps/mobile/eas.json +++ b/apps/mobile/eas.json @@ -9,6 +9,12 @@ "distribution": "internal", "channel": "development" }, + "ios-simulator": { + "extends": "development", + "ios": { + "simulator": true + } + }, "preview": { "distribution": "internal", "channel": "preview" diff --git a/apps/mobile/native/expo-module.config.json b/apps/mobile/native/expo-module.config.json index 3e4942bda2..ce59337ef5 100644 --- a/apps/mobile/native/expo-module.config.json +++ b/apps/mobile/native/expo-module.config.json @@ -7,7 +7,11 @@ "ToasterModule", "AppleIntelligenceGlowEffectModule", "FollowNative.GaleriaModule", - "GaleriaAccessoryModule" + "GaleriaAccessoryModule", + "TabBarModule", + "TabScreenModule", + "TabBarPortalModule", + "ProfileViewModule" ] }, "android": { diff --git a/apps/mobile/native/ios/FollowNative.podspec b/apps/mobile/native/ios/FollowNative.podspec index 5b730fda04..e478ab026a 100644 --- a/apps/mobile/native/ios/FollowNative.podspec +++ b/apps/mobile/native/ios/FollowNative.podspec @@ -1,4 +1,5 @@ require 'json' +new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1' package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json'))) @@ -11,8 +12,8 @@ Pod::Spec.new do |s| s.author = package['author'] s.homepage = package['homepage'] s.platforms = { - :ios => '15.1', - :tvos => '15.1' + :ios => '17.0', + :tvos => '17.0' } s.swift_version = '5.4' s.source = { git: 'https://github.com/RSSNext/follow' } @@ -25,6 +26,7 @@ Pod::Spec.new do |s| # Swift/Objective-C compatibility s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', + 'OTHER_SWIFT_FLAGS' => "$(inherited) #{new_arch_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''}", } s.source_files = "**/*.{h,m,mm,swift,hpp,cpp,js}" diff --git a/apps/mobile/native/ios/Models/ProfileData.swift b/apps/mobile/native/ios/Models/ProfileData.swift new file mode 100644 index 0000000000..abdb774f78 --- /dev/null +++ b/apps/mobile/native/ios/Models/ProfileData.swift @@ -0,0 +1,49 @@ +import Foundation +import ExpoModulesCore + +struct ProfileData: Codable { + var lists: [ProfileList] + var feeds: [ProfileFeed] + var groupedFeeds: [String: [ProfileFeed]] + + static var mockData: ProfileData { + let decoder = JSONDecoder() + guard let url = Bundle.main.url(forResource: "Profile", withExtension: "json"), + let data = try? Data(contentsOf: url), + let profileData = try? decoder.decode(ProfileData.self, from: data) + else { + // Return empty data if decoding fails + return ProfileData(lists: [], feeds: [], groupedFeeds: [:]) + } + return profileData + } +} + +struct ProfileList: Codable, Identifiable { + var id: String + var title: String + var image: String? + var description: String? + var view: FeedViewType + var customTitle: String? +} + +struct ProfileFeed: Codable, Identifiable { + var id: String + var title: String + var image: String? + var description: String? + var siteUrl: String + var url: String + var view: FeedViewType + var customTitle: String? +} + +enum FeedViewType: Int, Codable { + case Article = 0 + case SocialMedia = 1 + case Image = 2 + case Video = 3 + case Audio = 4 + case Notification = 5 +} diff --git a/apps/mobile/native/ios/Models/UserData.swift b/apps/mobile/native/ios/Models/UserData.swift new file mode 100644 index 0000000000..aecb84e6d2 --- /dev/null +++ b/apps/mobile/native/ios/Models/UserData.swift @@ -0,0 +1,37 @@ +// +// UserData.swift +// SwiftUIDemo +// +// Created by Innei on 2025/3/24. +// + +import Foundation + +struct UserData: Codable { + var id: String + var name: String + var email: String + var emailVerified: Bool + var image: String + var createdAt: String + var updatedAt: String + var twoFactorEnabled: Bool + var isAnonymous: Bool? + var handle: String + + static var mockData: UserData { + + let decoder = JSONDecoder() + guard let url = Bundle.main.url(forResource: "User", withExtension: "json"), + let data = try? Data(contentsOf: url), + let profileData = try? decoder.decode(UserData.self, from: data) + else { + // Return empty data if decoding fails + return UserData( + id: "", name: "", email: "", emailVerified: false, image: "", createdAt: "", updatedAt: "", + twoFactorEnabled: false, isAnonymous: false, handle: "") + } + return profileData + } + +} diff --git a/apps/mobile/native/ios/Modules/ProfileView/ProfileViewModule.swift b/apps/mobile/native/ios/Modules/ProfileView/ProfileViewModule.swift new file mode 100644 index 0000000000..f44ff685bd --- /dev/null +++ b/apps/mobile/native/ios/Modules/ProfileView/ProfileViewModule.swift @@ -0,0 +1,41 @@ +// +// ProfileViewModule.swift +// Pods +// +// Created by Innei on 2025/3/24. +// +import ExpoModulesCore +import SwiftUI + +public class ProfileViewModule: Module { + public func definition() -> ModuleDefinition { + Name("ProfileView") + Events("onPress") + View(ExpoProfileView.self) + + } +} + +public class ProfileViewProps: ExpoSwiftUI.ViewProps { + @Field var payload: String + let onPress = EventDispatcher() +} + +struct ProfilePayload: Codable { + var profile: ProfileData + var user: UserData + + public static func parse(jsonString: String) -> ProfilePayload? { + let data = jsonString.data(using: .utf8)! + let decoder = JSONDecoder() + return try? decoder.decode(ProfilePayload.self, from: data) + } +} +struct ExpoProfileView: ExpoSwiftUI.View { + @EnvironmentObject var props: ProfileViewProps + var body: some View { + if let payload = ProfilePayload.parse(jsonString: props.payload) { + ProfileView(profile: .constant(payload.profile), user: .constant(payload.user), onPress: props.onPress) + } + } +} diff --git a/apps/mobile/native/ios/Modules/SharedWebView/FOWebView.swift b/apps/mobile/native/ios/Modules/SharedWebView/FOWebView.swift index 91f95f1c27..f548d0f6d3 100644 --- a/apps/mobile/native/ios/Modules/SharedWebView/FOWebView.swift +++ b/apps/mobile/native/ios/Modules/SharedWebView/FOWebView.swift @@ -39,7 +39,7 @@ class FOWebView: WKWebView { navigationDelegate = self uiDelegate = self } - + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } diff --git a/apps/mobile/native/ios/Modules/SharedWebView/SharedWebView.swift b/apps/mobile/native/ios/Modules/SharedWebView/SharedWebView.swift index 6766883c53..f621082d87 100644 --- a/apps/mobile/native/ios/Modules/SharedWebView/SharedWebView.swift +++ b/apps/mobile/native/ios/Modules/SharedWebView/SharedWebView.swift @@ -6,13 +6,10 @@ import WebKit class WebViewView: ExpoView { private var cancellable: AnyCancellable? - private let rctView = RCTView(frame: .zero) required init(appContext: AppContext? = nil) { super.init(appContext: appContext) - addSubview(rctView) - - rctView.addSubview(SharedWebViewModule.sharedWebView!) + addSubview(SharedWebViewModule.sharedWebView!) clipsToBounds = true cancellable = WebViewManager.state.$contentHeight @@ -21,7 +18,7 @@ class WebViewView: ExpoView { self?.layoutSubviews() } } - + deinit { cancellable?.cancel() } @@ -40,7 +37,6 @@ class WebViewView: ExpoView { webView.scrollView.frame = rect frame = rect - rctView.frame = rect onContentHeightChange(["height": Float(rect.height)]) } diff --git a/apps/mobile/native/ios/Modules/TabBar/TabBarModule.swift b/apps/mobile/native/ios/Modules/TabBar/TabBarModule.swift new file mode 100644 index 0000000000..597ed9b02f --- /dev/null +++ b/apps/mobile/native/ios/Modules/TabBar/TabBarModule.swift @@ -0,0 +1,37 @@ +// +// TabBarModule.swift +// FollowNative +// +// Created by Innei on 2025/3/16. +// + +import ExpoModulesCore + +public class TabBarModule: Module { + + public func definition() -> ModuleDefinition { + Name("TabBarRoot") + + Function("switchTab") { [weak self] (reactTag: Int, index: Int) in + DispatchQueue.main.async { + guard let bridge = self?.appContext?.reactBridge else { + return + } + + if let sourceView = bridge.uiManager.view(forReactTag: NSNumber(value: reactTag)) as! TabBarRootView? + + { + sourceView.switchToTab(index: index) + } + } + } + + View(TabBarRootView.self) { + Prop("selectedIndex") { (view, index: Int) in + view.switchToTab(index: index) + } + + Events("onTabIndexChange") + } + } +} diff --git a/apps/mobile/native/ios/Modules/TabBar/TabBarPortalModule.swift b/apps/mobile/native/ios/Modules/TabBar/TabBarPortalModule.swift new file mode 100644 index 0000000000..0bdf659bc3 --- /dev/null +++ b/apps/mobile/native/ios/Modules/TabBar/TabBarPortalModule.swift @@ -0,0 +1,21 @@ +// +// TabBarPortalModule.swift +// FollowNative +// +// Created by Innei on 2025/3/17. +// + +import ExpoModulesCore +import UIKit + +public class TabBarPortalModule: Module { + public func definition() -> ModuleDefinition { + Name("TabBarPortal") + + View(TabBarPortalView.self) {} + } +} + +class TabBarPortalView: ExpoView { + +} diff --git a/apps/mobile/native/ios/Modules/TabBar/TabBarRootView.swift b/apps/mobile/native/ios/Modules/TabBar/TabBarRootView.swift new file mode 100644 index 0000000000..555294eb18 --- /dev/null +++ b/apps/mobile/native/ios/Modules/TabBar/TabBarRootView.swift @@ -0,0 +1,126 @@ +// +// TabBarRootView.swift +// FollowNative +// +// Created by Innei on 2025/3/16. +// + +import ExpoModulesCore +import Foundation +import SnapKit + +class TabBarRootView: ExpoView { + private let tabBarController = UITabBarController() + private let vc = UIViewController() + private var tabViewControllers: [UIViewController] = [] + + private let onTabIndexChange = EventDispatcher() + + required init(appContext: AppContext? = nil) { + super.init(appContext: appContext) + + tabBarController.tabBar.isHidden = true + tabBarController.delegate = self + addSubview(vc.view) + vc.addChild(tabBarController) + vc.view!.snp.makeConstraints { make in + make.edges.equalToSuperview() + } + vc.view.addSubview(tabBarController.view) + tabBarController.didMove(toParent: vc) + + } + + #if RCT_NEW_ARCH_ENABLED + + override func mountChildComponentView(_ childComponentView: UIView, index: Int) { + self.insertSubview(childComponentView, at: index) + } + + override func unmountChildComponentView(_ childComponentView: UIView, index: Int) { + self.willRemoveSubview(childComponentView) + // gestureRecognizers?.removeAll() + + } + #endif + + public func switchToTab(index: Int) { + let beforeIndex = tabBarController.selectedIndex + if beforeIndex == index { + return + } + + if tabViewControllers.count < beforeIndex || tabViewControllers.count < index { + return + } + if let fromView = tabViewControllers[beforeIndex].view, + let toView = tabViewControllers[index].view + { + if fromView != toView { + UIView.transition( + from: fromView, + to: toView, + duration: 0.1, + options: [.transitionCrossDissolve, .preferredFramesPerSecond60], + completion: nil) + } + } + + tabBarController.selectedIndex = index + if let selectedViewController = tabBarController.selectedViewController { + tabBarController(tabBarController, didSelect: selectedViewController) + } + + } + + override func insertSubview(_ subview: UIView, at atIndex: Int) { + + if let tabScreenView = subview as? TabScreenView { + + let screenVC = UIViewController() + screenVC.view = tabScreenView + tabViewControllers.append(screenVC) + tabBarController.viewControllers = tabViewControllers + tabBarController.didMove(toParent: vc) + } + + if let tabBarPortalView = subview as? TabBarPortalView { + let tabBarView = self.tabBarController.view! + tabBarView.addSubview(tabBarPortalView) + + } + } + + override func willRemoveSubview(_ subview: UIView) { + if let tabScreenView = subview as? TabScreenView { + tabViewControllers.removeAll { viewController in + return viewController.view == tabScreenView + } + + tabBarController.viewControllers = tabViewControllers + tabBarController.didMove(toParent: vc) + } + } + +} + +// MARK: - UITabBarControllerDelegate +extension TabBarRootView: UITabBarControllerDelegate { + + func tabBarController( + _ tabBarController: UITabBarController, didSelect viewController: UIViewController + ) { + onTabIndexChange([ + "index": tabBarController.selectedIndex + ]) + } + + // func tabBarController( + // _ tabBarController: UITabBarController, + // animationControllerForTransitionFrom fromVC: UIViewController, to toVC: UIViewController + // ) -> (any UIViewControllerAnimatedTransitioning)? { + + // return nil + // } + +} diff --git a/apps/mobile/native/ios/Modules/TabBar/TabScreenModule.swift b/apps/mobile/native/ios/Modules/TabBar/TabScreenModule.swift new file mode 100644 index 0000000000..d78eae0b69 --- /dev/null +++ b/apps/mobile/native/ios/Modules/TabBar/TabScreenModule.swift @@ -0,0 +1,16 @@ +// +// TabScreenModule.swift +// FollowNative +// +// Created by Innei on 2025/3/16. +// + +import ExpoModulesCore + +public class TabScreenModule: Module { + + public func definition() -> ModuleDefinition { + Name("TabScreen") + View(TabScreenView.self) {} + } +} diff --git a/apps/mobile/native/ios/Modules/TabBar/TabScreenView.swift b/apps/mobile/native/ios/Modules/TabBar/TabScreenView.swift new file mode 100644 index 0000000000..0ea70ab791 --- /dev/null +++ b/apps/mobile/native/ios/Modules/TabBar/TabScreenView.swift @@ -0,0 +1,16 @@ +// +// TabScreenView.swift +// FollowNative +// +// Created by Innei on 2025/3/16. +// + +import ExpoModulesCore +import UIKit + +class TabScreenView: ExpoView { + required init(appContext: AppContext? = nil) { + super.init(appContext: appContext) + } + +} diff --git a/apps/mobile/native/ios/Views/FallbackIconView.swift b/apps/mobile/native/ios/Views/FallbackIconView.swift new file mode 100644 index 0000000000..f0d9259f13 --- /dev/null +++ b/apps/mobile/native/ios/Views/FallbackIconView.swift @@ -0,0 +1,80 @@ +// +// FallbackIconView.swift +// FollowNative +// +// Created by Innei on 2025/3/24. +// + +import SwiftUI + +struct FallbackIcon: View { + var title: String + var size: CGFloat + var gray: Bool = false + + var body: some View { + ZStack { + // Generate gradient colors based on the title + LinearGradient( + gradient: getGradientForTitle(title: title, gray: gray), + startPoint: .topLeading, + endPoint: .bottomTrailing + ) + .frame(width: size, height: size) + .clipShape(RoundedRectangle(cornerRadius: size * 0.2)) + + // Display first character or first two characters based on if it's CJK + Text(getDisplayText(from: title)) + .font(.system(size: size * 0.5)) + .foregroundColor(.white) + } + } + + private func getDisplayText(from title: String) -> String { + guard !title.isEmpty else { return "" } + + // Check if the first character is CJK (Chinese, Japanese, Korean) + let firstChar = title.first! + let isCJK = isCJKCharacter(firstChar) + + if isCJK { + return String(firstChar) + } else { + return title.prefix(2).uppercased() + } + } + + private func isCJKCharacter(_ character: Character) -> Bool { + // Unicode ranges for CJK characters + let cjkRanges: [ClosedRange] = [ + 0x4E00...0x9FFF, // CJK Unified Ideographs + 0x3040...0x309F, // Hiragana + 0x30A0...0x30FF, // Katakana + 0xAC00...0xD7AF, // Hangul Syllables + ] + + let unicodeScalar = character.unicodeScalars.first!.value + return cjkRanges.contains { $0.contains(unicodeScalar) } + } + + private func getGradientForTitle(title: String, gray: Bool) -> Gradient { + if gray { + return Gradient(colors: [Color.gray, Color.gray.opacity(0.7)]) + } + + // Simple hash function to generate consistent colors based on title + var hash = 0 + for char in title { + hash = ((hash << 5) &- hash) &+ Int(char.asciiValue ?? 0) + } + + // Generate hue values between 0 and 1 + let hue = abs(Double(hash % 360) / 360.0) + + return Gradient(colors: [ + Color(hue: hue, saturation: 0.7, brightness: 0.8), + Color(hue: hue, saturation: 0.5, brightness: 0.6), + ]) + } +} + diff --git a/apps/mobile/native/ios/Views/FeedIconView.swift b/apps/mobile/native/ios/Views/FeedIconView.swift new file mode 100644 index 0000000000..8f5f6e56a7 --- /dev/null +++ b/apps/mobile/native/ios/Views/FeedIconView.swift @@ -0,0 +1,167 @@ +// +// FeedIconView.swift +// +// Created by Innei on 2025/3/24. +// + +import SwiftUI + +struct FeedIconView: View { + var feed: FeedIconFeedData? + var fallbackUrl: String? + var size: CGFloat = 20 + var fallback: Bool = true + var siteUrl: String? + + var body: some View { + if let iconSource = getFeedIconSource() { + AsyncImage(url: URL(string: iconSource)) { phase in + switch phase { + case .empty: + RoundedRectangle(cornerRadius: CGFloat(4), style: .continuous) + .fill(Color.gray.opacity(0.5)) + .frame(width: size, height: size) + case .success(let image): + image + .resizable() + .aspectRatio(contentMode: .fill) + .frame(width: size, height: size) + .clipShape(RoundedRectangle(cornerRadius: 4)) + case .failure: + let fallbackTitle = feed?.title ?? extractDomainFromUrl(siteUrl ?? fallbackUrl ?? "") + FallbackIcon(title: fallbackTitle, size: size) + + @unknown default: + RoundedRectangle(cornerRadius: CGFloat(4), style: .continuous) + .fill(Color.gray.opacity(0.5)) + .frame(width: size, height: size) + } + } + .frame(width: size, height: size) + } else { + let fallbackTitle = feed?.title ?? extractDomainFromUrl(siteUrl ?? fallbackUrl ?? "") + FallbackIcon(title: fallbackTitle, size: size) + + } + } + + private func getFeedIconSource() -> String? { + switch true { + case feed == nil && siteUrl != nil: + return getUrlIcon(url: siteUrl!, fallback: fallback).src + case feed != nil && feed?.image != nil && !(feed?.image?.isEmpty ?? true): + return feed?.image + case feed != nil && (feed?.image == nil || feed?.image?.isEmpty ?? true) + && feed?.siteUrl != nil: + return getUrlIcon(url: feed!.siteUrl!, fallback: fallback).src + default: + return nil + } + } + + private func getUrlIcon(url: String, fallback: Bool) -> (src: String, fallbackUrl: String) { + var src: String + var fallbackUrl = "" + + if let urlObj = URL(string: url), let host = urlObj.host { + let pureDomain = extractDomainFromUrl(host) + fallbackUrl = + "https://avatar.vercel.sh/\(pureDomain).svg?text=\(pureDomain.prefix(2).uppercased())" + src = "https://unavatar.webp.se/\(host)?fallback=\(fallback)" + } else { + let pureDomain = extractDomainFromUrl(url) + src = "https://avatar.vercel.sh/\(pureDomain).svg?text=\(pureDomain.prefix(2).uppercased())" + } + + return (src, fallbackUrl) + } + + private func extractDomainFromUrl(_ url: String) -> String { + // Simple domain extraction - in a real app you'd want to use a more robust solution + let components = url.components(separatedBy: ".") + if components.count >= 2 { + return components[components.count - 2] + } + return url + } +} + +// Feed data model +struct FeedIconFeedData: Identifiable { + var id: String + + var title: String + var url: String + var image: String? + var siteUrl: String? + + static func transform(_ feed: ProfileFeed) -> FeedIconFeedData { + FeedIconFeedData( + id: feed.id, + title: feed.title, + url: feed.url, + image: feed.image, + siteUrl: feed.siteUrl + ) + } + + #if DEBUG + static var mockData: FeedIconFeedData { + FeedIconFeedData( + id: "1", + + title: "Example Feed", + url: "https://example.com/feed", + image: nil, + siteUrl: "https://example.com" + + ) + } + #endif +} + +#Preview { + VStack(spacing: 20) { + // Feed with image + FeedIconView( + feed: FeedIconFeedData( + id: "1", + title: "Example Feed", + url: "https://example.com/feed", + image: "https://picsum.photos/200", + siteUrl: "https://example.com" + ), + size: 40 + ) + + // Feed without image, using site URL + FeedIconView( + feed: FeedIconFeedData( + id: "2", + title: "No Image Feed", + url: "https://noimage.com/feed", + image: nil, + siteUrl: "https://noimage.com" + ), + size: 40 + ) + + // Just a site URL + FeedIconView( + size: 40, siteUrl: "https://github.com" + ) + + // Fallback + FeedIconView( + feed: FeedIconFeedData( + id: "3", + title: "Fallback Example", + url: "https://invalid-url", + image: nil, + siteUrl: nil + ), + size: 40 + ) + } + .padding() +} diff --git a/apps/mobile/native/ios/Views/ProfileView.swift b/apps/mobile/native/ios/Views/ProfileView.swift new file mode 100644 index 0000000000..9426c89d92 --- /dev/null +++ b/apps/mobile/native/ios/Views/ProfileView.swift @@ -0,0 +1,182 @@ +// +// ProfileView.swift +// +// Created by Innei on 2025/3/24. +// + +import ExpoModulesCore +import SwiftUI + +struct ProfileView: View { + @Binding var profile: ProfileData + @Binding var user: UserData + let onPress: EventDispatcher + + var hasAnyFeeds: Bool { + !profile.feeds.isEmpty || !profile.groupedFeeds.isEmpty + } + + var body: some View { + + List { + VStack { + VStack { + ProfileAvatar(image: user.image, name: user.name) + Text(user.name) + .font(.title) + .fontWeight(.bold) + .lineLimit(1) + + if !user.handle.isEmpty { + Text("@\(user.handle)") + .foregroundColor(.gray) + } + } + .frame(maxWidth: .infinity) + .padding(.top, 30) + .padding(.bottom, 20) + .listRowInsets(EdgeInsets()) + .listRowSeparator(.hidden) + + }.listRowInsets(.none) + + if !profile.lists.isEmpty { + + Section(header: SectionHeaderText(text: "Lists")) { + ForEach($profile.lists, id: \.id) { $list in + Button { + onPress(["type": "list", "id": list.id]) + } label: { + HStack { + ProfileListImage( + image: list.image, title: list.title, + customTitle: list.customTitle) + + ProfileItemTitle(title: list.title, customTitle: list.customTitle) + } + + }.foregroundStyle(.foreground) + } + } + + } + + if hasAnyFeeds { + Section(header: SectionHeaderText(text: "Feeds")) { + } + } + + ForEach(profile.groupedFeeds.sorted(by: { $0.key < $1.key }), id: \.key) { key, value in + + Section( + header: + Text(key).textCase(.none) + ) { + ForEach(value, id: \.id) { feed in + Button { + onPress(["type": "feed", "id": feed.id]) + + } label: { + HStack { + FeedIconView( + feed: FeedIconFeedData.transform(feed), size: 24, + fallback: true, + siteUrl: feed.siteUrl + ) + + ProfileItemTitle(title: feed.title, customTitle: feed.customTitle) + } + }.foregroundStyle(.foreground) + } + } + } + + if !profile.feeds.isEmpty { + Section(header: Text("Uncategorized Feeds").textCase(.none)) { + ForEach($profile.feeds, id: \.id) { $feed in + Button { + onPress(["type": "feed", "id": feed.id]) + } label: { + HStack { + FeedIconView( + feed: FeedIconFeedData.transform(feed), size: 24, + fallback: true, + siteUrl: feed.siteUrl + ) + + ProfileItemTitle(title: feed.title, customTitle: feed.customTitle) + } + + }.foregroundStyle(.foreground) + } + } + } + + }.listStyle(.insetGrouped) + .listSectionSpacing(0) + + } +} + +private struct ProfileListImage: View { + var image: String? + var title: String + var customTitle: String? + var body: some View { + if let image = image, !image.isEmpty { + Image(systemName: image) + .frame(width: 24, height: 24) + } else { + // Fallback icon with gradient background based on title + FallbackIcon(title: customTitle ?? title, size: 24) + } + } +} + + +private struct SectionHeaderText: View { + let text: String + + var body: some View { + Text(text).font(.headline).foregroundStyle(.black).textCase(.none).padding(.top, 20) + } +} + +private struct ProfileItemTitle: View { + let title: String + let customTitle: String? + + var body: some View { + if let customTitle = customTitle, !customTitle.isEmpty { + Text(customTitle).lineLimit(1) + } else { + Text(title).lineLimit(1) + } + } +} + +private struct ProfileAvatar: View { + let image: String? + let name: String + var body: some View { + AsyncImage(url: URL(string: image ?? "")) { phase in + switch phase { + case .empty: + ProgressView() + case .success(let image): + image + .resizable() + .scaledToFill() + case .failure: + FallbackIcon(title: name, size: 80) + @unknown default: + FallbackIcon(title: name, size: 80) + } + } + + .scaledToFill() + .frame(width: 80, height: 80) + .clipShape(Circle()) + + } +} diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 59b68fcd83..5e6e552cae 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -1,21 +1,24 @@ { "name": "@follow/mobile", - "version": "0.1.1", + "version": "0.1.2", "private": true, "main": "src/main.tsx", "scripts": { "android": "expo run:android", + "bump": "vv", "db:generate": "drizzle-kit generate", "dev": "npm run start", + "eas-build-post-install": "rm -rf $TMPDIR/metro-cache", "ios": "expo run:ios", "ios:device": "expo run:ios --device", - "lint": "expo lint", "start": "expo start --dev-client", + "start:clean": "expo start --dev-client --clear", "typecheck": "tsc --noEmit", "web": "expo start --web" }, "dependencies": { "@better-auth/expo": "1.2.4", + "@expo/metro-runtime": "4.0.1", "@expo/react-native-action-sheet": "4.1.1", "@expo/vector-icons": "14.0.4", "@follow/components": "workspace:*", @@ -24,6 +27,7 @@ "@follow/models": "workspace:*", "@follow/shared": "workspace:*", "@follow/utils": "workspace:*", + "@gorhom/portal": "1.0.14", "@hookform/resolvers": "4.1.3", "@react-native-community/image-editor": "4.3.0", "@react-native-firebase/analytics": "21.12.0", @@ -31,27 +35,24 @@ "@react-native-firebase/app-check": "21.12.0", "@react-native-firebase/crashlytics": "21.12.0", "@react-native-picker/picker": "2.11.0", - "@react-navigation/bottom-tabs": "7.2.1", - "@react-navigation/drawer": "7.1.2", - "@react-navigation/native": "7.0.15", "@shopify/flash-list": "1.7.3", - "@tanstack/query-sync-storage-persister": "5.67.3", - "@tanstack/react-query": "5.67.3", - "@tanstack/react-query-persist-client": "5.67.3", + "@tanstack/query-sync-storage-persister": "5.68.0", + "@tanstack/react-query": "5.68.0", + "@tanstack/react-query-persist-client": "5.68.0", "@types/qrcode": "1.5.5", "better-auth": "1.2.4", "cookie-es": "2.0.0", "dayjs": "1.11.13", "dnum": "2.14.0", "es-toolkit": "1.33.0", - "expo": "52.0.38", + "expo": "52.0.39", "expo-apple-authentication": "7.1.3", "expo-av": "15.0.2", "expo-blur": "14.0.3", "expo-build-properties": "0.13.2", "expo-clipboard": "7.0.1", "expo-constants": "17.0.8", - "expo-dev-client": "5.0.12", + "expo-dev-client": "5.0.14", "expo-document-picker": "13.0.3", "expo-file-system": "18.0.11", "expo-haptics": "14.0.1", @@ -62,7 +63,6 @@ "expo-linking": "7.0.5", "expo-localization": "16.0.1", "expo-media-library": "17.0.6", - "expo-router": "4.0.18", "expo-secure-store": "14.0.1", "expo-sharing": "13.0.1", "expo-splash-screen": "0.29.22", @@ -82,6 +82,7 @@ "qrcode": "1.5.4", "react": "18.3.1", "react-dom": "18.3.1", + "react-error-boundary": "5.0.0", "react-hook-form": "7.54.2", "react-native": "0.77.1", "react-native-awesome-slider": "2.9.0", @@ -101,13 +102,14 @@ "react-native-sheet-transitions": "0.1.2", "react-native-svg": "15.11.2", "react-native-track-player": "4.1.1", - "react-native-uikit-colors": "0.3.8", + "react-native-uikit-colors": "0.3.10", "react-native-video": "6.10.2", "react-native-volume-manager": "2.0.8", "react-native-web": "0.19.13", "react-native-webview": "13.13.4", "shiki": "3.2.1", "tailwindcss": "3.4.17", + "use-sync-external-store": "1.4.0", "usehooks-ts": "3.1.1", "zeego": "3.0.5", "zod": "3.24.2", @@ -121,9 +123,10 @@ "drizzle-kit": "0.30.5", "eas-cli": "15.0.15", "expo-drizzle-studio-plugin": "0.1.1", - "postcss": "8.5.2" + "nbump": "2.0.7", + "postcss": "8.5.3" }, - "appName": "Follow", + "appName": "Folo", "expo": { "install": { "exclude": [ @@ -137,5 +140,19 @@ "autolinking": { "nativeModulesDir": "./native" } + }, + "bump": { + "before": [ + "git pull --rebase", + "pnpm eslint --fix package.json", + "pnpm prettier --ignore-unknown --write package.json", + "git add package.json" + ], + "commit_message": "release(mobile): release v${NEW_VERSION}", + "tag": false, + "changelog": false, + "allowed_branches": [ + "dev" + ] } } diff --git a/apps/mobile/src/Analytics.tsx b/apps/mobile/src/Analytics.tsx new file mode 100644 index 0000000000..34960d490e --- /dev/null +++ b/apps/mobile/src/Analytics.tsx @@ -0,0 +1,23 @@ +import analytics from "@react-native-firebase/analytics" +import { useEffect } from "react" + +import { Navigation } from "./lib/navigation/Navigation" + +export const Analytics = () => { + useEffect(() => { + return Navigation.rootNavigation.on("didAppear", ({ screenId }) => { + const logScreenView = async () => { + try { + await analytics().logScreenView({ + screen_name: screenId, + screen_class: screenId, + }) + } catch (err: any) { + console.warn(`[Error] logScreenView: ${err}`) + } + } + logScreenView() + }) + }, []) + return null +} diff --git a/apps/mobile/src/App.tsx b/apps/mobile/src/App.tsx new file mode 100644 index 0000000000..56d29ec2b3 --- /dev/null +++ b/apps/mobile/src/App.tsx @@ -0,0 +1,42 @@ +import { View } from "react-native" +import Animated, { interpolate, useAnimatedStyle } from "react-native-reanimated" +import { RootSiblingParent } from "react-native-root-siblings" +import { useSheet } from "react-native-sheet-transitions" + +import { FullWindowOverlay } from "./components/common/FullWindowOverlay" +import { useIntentHandler } from "./hooks/useIntentHandler" +import { DebugButton, EnvProfileIndicator } from "./modules/debug" +import { useOnboarding, usePrefetchSessionUser } from "./store/user/hooks" + +export function App({ children }: { children: React.ReactNode }) { + useIntentHandler() + useOnboarding() + const { scale } = useSheet() + + const style = useAnimatedStyle(() => ({ + borderRadius: interpolate(scale.value, [0.8, 0.99, 1], [0, 50, 0]), + transform: [ + { + scale: scale.value, + }, + ], + })) + return ( + + + + + {children} + + {__DEV__ && } + + + + + ) +} + +const Session = () => { + usePrefetchSessionUser() + return null +} diff --git a/apps/mobile/src/atoms/settings/general.ts b/apps/mobile/src/atoms/settings/general.ts index f9a903b035..4d7bc5681f 100644 --- a/apps/mobile/src/atoms/settings/general.ts +++ b/apps/mobile/src/atoms/settings/general.ts @@ -6,7 +6,7 @@ const createDefaultSettings = (): GeneralSettings => ({ // App language: "en", - translationLanguage: "zh-CN", + actionLanguage: "zh-CN", // Data control diff --git a/apps/mobile/src/components/common/ErrorBoundary.tsx b/apps/mobile/src/components/common/ErrorBoundary.tsx new file mode 100644 index 0000000000..7e0626b798 --- /dev/null +++ b/apps/mobile/src/components/common/ErrorBoundary.tsx @@ -0,0 +1,18 @@ +import { ErrorBoundary as ReactErrorBoundary } from "react-error-boundary" +import { Text, View } from "react-native" + +const ErrorBoundaryFallback = ({ error }: { error: Error }) => { + return ( + + {error.message} + + ) +} + +export const ErrorBoundary = ({ children }: { children: React.ReactNode }) => { + return ( + }> + {children} + + ) +} diff --git a/apps/mobile/src/components/common/HeaderTitleExtra.tsx b/apps/mobile/src/components/common/HeaderTitleExtra.tsx deleted file mode 100644 index be22ff0dec..0000000000 --- a/apps/mobile/src/components/common/HeaderTitleExtra.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { cn } from "@follow/utils" -import { useTheme } from "@react-navigation/native" -import type { StyleProp, TextProps, TextStyle } from "react-native" -import { Animated, StyleSheet, Text, View } from "react-native" - -type Props = Omit & { - tintColor?: string - children?: string - style?: Animated.WithAnimatedValue> - subText?: string - subTextStyle?: StyleProp - subTextClassName?: string -} - -export function HeaderTitleExtra({ - tintColor, - style, - subText, - subTextStyle, - subTextClassName, - ...rest -}: Props) { - const { fonts } = useTheme() - - return ( - - - {!!subText && ( - - {subText} - - )} - - ) -} - -const styles = StyleSheet.create({ - title: { fontSize: 17 }, -}) diff --git a/apps/mobile/src/components/common/Link.tsx b/apps/mobile/src/components/common/Link.tsx new file mode 100644 index 0000000000..93c516a0c8 --- /dev/null +++ b/apps/mobile/src/components/common/Link.tsx @@ -0,0 +1,24 @@ +import type { PropsWithChildren } from "react" +import type { TextProps } from "react-native" +import { Linking, Text } from "react-native" + +export const Link = ({ + href, + children, + ...props +}: PropsWithChildren<{ href: string } & TextProps>) => { + return ( + { + const canOpen = await Linking.canOpenURL(href) + if (canOpen) { + Linking.openURL(href) + } + }} + {...props} + > + {children} + + ) +} diff --git a/apps/mobile/src/components/common/ModalSharedComponents.tsx b/apps/mobile/src/components/common/ModalSharedComponents.tsx deleted file mode 100644 index 675d805abb..0000000000 --- a/apps/mobile/src/components/common/ModalSharedComponents.tsx +++ /dev/null @@ -1,73 +0,0 @@ -import { withOpacity } from "@follow/utils" -import { router } from "expo-router" -import { useCallback, useMemo } from "react" -import { TouchableOpacity } from "react-native" - -import { useIsRouteOnlyOne } from "@/src/hooks/useIsRouteOnlyOne" -import { CheckLineIcon } from "@/src/icons/check_line" -import { CloseCuteReIcon } from "@/src/icons/close_cute_re" -import { MingcuteLeftLineIcon } from "@/src/icons/mingcute_left_line" -import { useColor } from "@/src/theme/colors" - -import { RotateableLoading } from "./RotateableLoading" - -export const ModalHeaderCloseButton = () => { - return -} - -const ModalHeaderCloseButtonImpl = () => { - const label = useColor("label") - - const routeOnlyOne = useIsRouteOnlyOne() - const memoedRouteOnlyOne = useMemo(() => routeOnlyOne, []) - - const handlePress = useCallback(() => { - if (router.canDismiss()) { - router.dismiss() - } else { - // If we can't dismiss, redirect to the root route - router.replace("/") - } - }, []) - - return ( - - {memoedRouteOnlyOne ? ( - - ) : ( - - )} - - ) -} - -export interface ModalHeaderSubmitButtonProps { - isValid: boolean - onPress: () => void - isLoading?: boolean -} -export const ModalHeaderSubmitButton = ({ - isValid, - onPress, - isLoading, -}: ModalHeaderSubmitButtonProps) => { - return -} - -const ModalHeaderShubmitButtonImpl = ({ - isValid, - onPress, - isLoading, -}: ModalHeaderSubmitButtonProps) => { - const label = useColor("label") - - return ( - - {isLoading ? ( - - ) : ( - - )} - - ) -} diff --git a/apps/mobile/src/components/common/RefreshControl.tsx b/apps/mobile/src/components/common/RefreshControl.tsx index 21673aba86..393673b500 100644 --- a/apps/mobile/src/components/common/RefreshControl.tsx +++ b/apps/mobile/src/components/common/RefreshControl.tsx @@ -47,8 +47,14 @@ export function CustomRefreshControl({ refreshing, pullProgress }: CustomRefresh const strokeDashoffset = CIRCUMFERENCE * (1 - Math.max(Math.min(pullProgress - 0.2, 1), 0)) + const opacityStyle = useAnimatedStyle(() => { + return { + opacity: pullProgress > 0 ? 1 : 0, + } + }) + return ( - 0 ? 1 : 0 }]}> + { cancelAnimation(disabledValue) - disabledValue.value = withTiming(props.disabled ? 1 : 0) - }, [props.disabled]) + disabledValue.value = withTiming(disabled ? 1 : 0) + }, [disabled]) const buttonStyle = useAnimatedStyle(() => ({ backgroundColor: interpolateColor(disabledValue.value, [1, 0], [disableColor, accentColor]), @@ -40,7 +41,7 @@ export function SubmitButton({ return ( diff --git a/apps/mobile/src/components/layouts/header/FakeNativeHeaderTitle.tsx b/apps/mobile/src/components/layouts/header/FakeNativeHeaderTitle.tsx new file mode 100644 index 0000000000..2fd94b5da7 --- /dev/null +++ b/apps/mobile/src/components/layouts/header/FakeNativeHeaderTitle.tsx @@ -0,0 +1,27 @@ +import type { StyleProp, TextProps, TextStyle } from "react-native" +import { Animated, StyleSheet } from "react-native" + +type Props = Omit & { + tintColor?: string + children?: string + style?: Animated.WithAnimatedValue> +} + +export function FakeNativeHeaderTitle({ style, ...rest }: Props) { + return ( + + ) +} + +const styles = StyleSheet.create({ + title: { + fontSize: 17, + }, +}) diff --git a/apps/mobile/src/components/layouts/header/HeaderElements.tsx b/apps/mobile/src/components/layouts/header/HeaderElements.tsx new file mode 100644 index 0000000000..23ae3e5b35 --- /dev/null +++ b/apps/mobile/src/components/layouts/header/HeaderElements.tsx @@ -0,0 +1,78 @@ +import { withOpacity } from "@follow/utils" +import { useCallback } from "react" +import { TouchableOpacity } from "react-native" + +import { CheckLineIcon } from "@/src/icons/check_line" +import { CloseCuteReIcon } from "@/src/icons/close_cute_re" +import { MingcuteLeftLineIcon } from "@/src/icons/mingcute_left_line" +import { + useCanDismiss, + useIsSingleRouteInGroup, + useNavigation, + useScreenIsInSheetModal, +} from "@/src/lib/navigation/hooks" +import { StackScreenHeaderPortal } from "@/src/lib/navigation/StackScreenHeaderPortal" +import { useColor } from "@/src/theme/colors" + +import { RotateableLoading } from "../../common/RotateableLoading" +import { UINavigationHeaderActionButton } from "./NavigationHeader" + +const HeaderCloseButton = () => { + const label = useColor("label") + + const navigation = useNavigation() + const canDismiss = useCanDismiss() + const isInModal = useScreenIsInSheetModal() + const isSingleRouteInGroup = useIsSingleRouteInGroup() + const handlePress = useCallback(() => { + if (canDismiss) { + navigation.dismiss() + } else { + navigation.back() + } + }, [canDismiss, navigation]) + + return ( + + {isInModal && isSingleRouteInGroup ? ( + + ) : ( + + )} + + ) +} + +export interface ModalHeaderSubmitButtonProps { + isValid: boolean + onPress: () => void + isLoading?: boolean +} + +export const HeaderSubmitButton = ({ + isValid, + onPress, + isLoading, +}: ModalHeaderSubmitButtonProps) => { + const label = useColor("label") + + return ( + + {isLoading ? ( + + ) : ( + + )} + + ) +} + +export const HeaderCloseOnly = () => { + return ( + + + + + + ) +} diff --git a/apps/mobile/src/components/layouts/header/ModalHeader.tsx b/apps/mobile/src/components/layouts/header/ModalHeader.tsx deleted file mode 100644 index 1faa9bf37d..0000000000 --- a/apps/mobile/src/components/layouts/header/ModalHeader.tsx +++ /dev/null @@ -1,105 +0,0 @@ -import { useTypeScriptHappyCallback } from "@follow/hooks/exports" -import type { NativeStackNavigationOptions } from "@react-navigation/native-stack" -import { Stack } from "expo-router" -import type { FC } from "react" -import { memo } from "react" -import { StyleSheet, View } from "react-native" -import type { SharedValue } from "react-native-reanimated" -import Animated, { useAnimatedStyle } from "react-native-reanimated" -import { useSafeAreaFrame, useSafeAreaInsets } from "react-native-safe-area-context" -import { useColor } from "react-native-uikit-colors" - -import { HeaderTitleExtra } from "../../common/HeaderTitleExtra" -import { ModalHeaderCloseButton } from "../../common/ModalSharedComponents" -import { ThemedBlurView } from "../../common/ThemedBlurView" -import { useModalScrollViewContext } from "../contexts/ModalScrollViewContext" -import { getDefaultHeaderHeight } from "../utils" - -interface ModalHeaderProps - extends Omit { - headerLeft?: React.ReactNode - headerRight?: React.ReactNode - headerTitle?: string - headerSubtitle?: string -} - -export const ModalHeader: FC = (props) => { - const { animatedY } = useModalScrollViewContext() - - return ( - props.headerLeft ?? , - headerRight: () => props.headerRight, - - header: useTypeScriptHappyCallback( - ({ options }) => ( -
- ), - [animatedY, props.headerSubtitle, props.headerTitle], - ), - }} - /> - ) -} - -interface HeaderProps { - headerTitle?: string - headerLeft?: React.ReactNode - headerRight?: React.ReactNode - animatedY: SharedValue - headerSubtitle?: string -} - -const InternalBlurEffectWithBottomBorder = (props: { animatedY: SharedValue }) => { - const border = useColor("opaqueSeparator") - const animatedStyle = useAnimatedStyle(() => { - return { - opacity: Math.max(0, Math.min(1, props.animatedY.value / 10)), - borderBottomWidth: StyleSheet.hairlineWidth, - borderBottomColor: border, - } - }) - return ( - - - - ) -} - -const Header: FC = memo( - ({ headerTitle, headerLeft, headerRight, headerSubtitle, animatedY }) => { - const frame = useSafeAreaFrame() - const insets = useSafeAreaInsets() - const height = getDefaultHeaderHeight(frame, true, insets.top) - - return ( - - - {/* Grid */} - - {/* Left actions */} - {headerLeft} - - {/* Title */} - - {/* Title */} - {headerTitle} - - - {/* Right actions */} - {headerRight} - - - ) - }, -) diff --git a/apps/mobile/src/components/layouts/header/NavigationHeader.tsx b/apps/mobile/src/components/layouts/header/NavigationHeader.tsx index b18ab6fcfd..c438749f17 100644 --- a/apps/mobile/src/components/layouts/header/NavigationHeader.tsx +++ b/apps/mobile/src/components/layouts/header/NavigationHeader.tsx @@ -1,12 +1,11 @@ import { cn } from "@follow/utils" -import { getDefaultHeaderHeight, HeaderTitle } from "@react-navigation/elements" -import { router, useNavigation } from "expo-router" import type { FC, PropsWithChildren, ReactNode } from "react" import { createElement, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react" import type { LayoutChangeEvent } from "react-native" import { StyleSheet, TouchableOpacity, View } from "react-native" import type { AnimatedProps } from "react-native-reanimated" import Animated, { + useAnimatedReaction, useAnimatedRef, useAnimatedStyle, useSharedValue, @@ -17,21 +16,31 @@ import { useSafeAreaFrame, useSafeAreaInsets } from "react-native-safe-area-cont import type { ViewProps } from "react-native-svg/lib/typescript/fabric/utils" import { useColor } from "react-native-uikit-colors" +import { CloseCuteReIcon } from "@/src/icons/close_cute_re" import { MingcuteLeftLineIcon } from "@/src/icons/mingcute_left_line" +import { + useCanBack, + useCanDismiss, + useNavigation, + useScreenIsInSheetModal, +} from "@/src/lib/navigation/hooks" +import { ScreenItemContext } from "@/src/lib/navigation/ScreenItemContext" import { ThemedBlurView } from "../../common/ThemedBlurView" -import { NavigationContext } from "../views/NavigationContext" +import { getDefaultHeaderHeight } from "../utils" import { SetNavigationHeaderHeightContext } from "../views/NavigationHeaderContext" +import { FakeNativeHeaderTitle } from "./FakeNativeHeaderTitle" +interface NavigationHeaderButtonProps { + canGoBack: boolean + canDismiss: boolean + modal?: boolean +} export interface NavigationHeaderRawProps { - headerLeft?: FC<{ - canGoBack: boolean - }> - headerTitle?: FC> | ReactNode + headerLeft?: FC + headerRight?: FC + headerTitle?: FC> | ReactNode headerTitleAbsolute?: boolean - headerRight?: FC<{ - canGoBack: boolean - }> title?: string @@ -50,7 +59,7 @@ const useHideableBottom = ( const largeDefaultHeaderHeightRef = useRef( originalDefaultHeaderHeight + (hideableBottomHeight || 0), ) - const largeHeaderHeight = useSharedValue(originalDefaultHeaderHeight) + const largeHeaderHeight = useSharedValue(largeDefaultHeaderHeightRef.current) const [hideableBottomRef, setHideableBottomRef] = useState() useEffect(() => { @@ -61,9 +70,10 @@ const useHideableBottom = ( }) }, [hideableBottomRef, largeHeaderHeight, originalDefaultHeaderHeight]) - const { scrollY } = useContext(NavigationContext)! - useEffect(() => { - const id = scrollY.addListener(({ value }) => { + const { reAnimatedScrollY } = useContext(ScreenItemContext)! + useAnimatedReaction( + () => reAnimatedScrollY.value, + (value) => { if (!enable) { return } @@ -78,12 +88,8 @@ const useHideableBottom = ( largeHeaderHeight.value = withTiming(largeDefaultHeaderHeight) } lastScrollY.current = value - }) - - return () => { - scrollY.removeListener(id) - } - }, [enable, largeHeaderHeight, originalDefaultHeaderHeight, scrollY]) + }, + ) const layoutHeightOnceRef = useRef(false) const onLayout = useCallback( @@ -113,10 +119,26 @@ const useHideableBottom = ( onLayout, } } -interface NavigationHeaderProps +export interface InternalNavigationHeaderProps extends Omit, "children">, - NavigationHeaderRawProps, - PropsWithChildren {} + PropsWithChildren { + headerLeft?: + | FC<{ + canGoBack: boolean + }> + | ReactNode + headerRight?: + | FC<{ + canGoBack: boolean + }> + | ReactNode + title?: string + + hideableBottom?: ReactNode + hideableBottomHeight?: number + headerTitleAbsolute?: boolean + headerTitle?: FC> | ReactNode +} const blurThreshold = 0 const titlebarPaddingHorizontal = 8 @@ -128,35 +150,41 @@ export const InternalNavigationHeader = ({ headerRight, title, headerTitle: customHeaderTitle, - modal = false, + hideableBottom, hideableBottomHeight, headerTitleAbsolute, ...rest -}: NavigationHeaderProps) => { +}: InternalNavigationHeaderProps) => { const insets = useSafeAreaInsets() const frame = useSafeAreaFrame() + + const sheetModal = useScreenIsInSheetModal() const defaultHeight = useMemo( - () => getDefaultHeaderHeight(frame, modal, insets.top), - [frame, insets.top, modal], + () => getDefaultHeaderHeight(frame, sheetModal, sheetModal ? 0 : insets.top), + [frame, insets.top, sheetModal], ) + const border = useColor("opaqueSeparator") const opacityAnimated = useSharedValue(0) - const { scrollY } = useContext(NavigationContext)! + const { reAnimatedScrollY } = useContext(ScreenItemContext)! const setHeaderHeight = useContext(SetNavigationHeaderHeightContext) - useEffect(() => { - const handler = ({ value }: { value: number }) => { + useAnimatedReaction( + () => reAnimatedScrollY.value, + (value) => { opacityAnimated.value = Math.max(0, Math.min(1, (value + blurThreshold) / 10)) - } - const id = scrollY.addListener(handler) + }, + ) - handler({ value: (scrollY as any)._value }) - return () => { - scrollY.removeListener(id) - } - }, [opacityAnimated, scrollY]) + const canBack = useCanBack() + const canDismiss = useCanDismiss() + + useEffect(() => { + const { value } = reAnimatedScrollY + opacityAnimated.value = Math.max(0, Math.min(1, (value + blurThreshold) / 10)) + }, [opacityAnimated, reAnimatedScrollY]) const blurStyle = useAnimatedStyle(() => ({ opacity: opacityAnimated.value, @@ -172,11 +200,8 @@ export const InternalNavigationHeader = ({ ) const rootTitleBarStyle = useAnimatedStyle(() => { const styles = { - paddingTop: insets.top, - - minHeight: defaultHeight, + paddingTop: sheetModal ? 0 : insets.top, position: "relative", - overflow: "hidden", } satisfies DefaultStyle if (hideableBottom) { @@ -185,24 +210,16 @@ export const InternalNavigationHeader = ({ return styles }) - const navigation = useNavigation() - const canBack = navigation.canGoBack() - useEffect(() => { - if (title) { - navigation.setOptions({ title }) - } - }, [navigation, title]) - const HeaderLeft = headerLeft ?? DefaultHeaderBackButton - const renderTitle = customHeaderTitle ?? HeaderTitle + const renderTitle = customHeaderTitle ?? FakeNativeHeaderTitle const headerTitle = typeof renderTitle !== "function" ? renderTitle : createElement(renderTitle, { children: title, }) - const RightButton = headerRight ?? Noop + const RightButton = headerRight ?? (Noop as FC) const animatedRef = useAnimatedRef() useEffect(() => { @@ -235,22 +252,23 @@ export const InternalNavigationHeader = ({ style={{ marginLeft: insets.left, marginRight: insets.right, - height: !modal ? defaultHeight - insets.top : defaultHeight, + height: !sheetModal ? defaultHeight - insets.top : defaultHeight, paddingHorizontal: titlebarPaddingHorizontal, }} pointerEvents={"box-none"} > {/* Left */} - - + + {typeof HeaderLeft === "function" ? ( + + ) : ( + HeaderLeft + )} {/* Center */} - + {typeof RightButton === "function" ? ( + + ) : ( + RightButton + )} { +export const DefaultHeaderBackButton = ({ canGoBack, canDismiss }: NavigationHeaderButtonProps) => { const label = useColor("label") - if (!canGoBack) return null + const navigation = useNavigation() + if (!canGoBack && !canDismiss) return null return ( - router.back()}> - + { + if (canGoBack) { + navigation.back() + } else if (canDismiss) { + navigation.dismiss() + } + }} + > + {canGoBack ? ( + + ) : ( + + )} ) } diff --git a/apps/mobile/src/components/layouts/tabbar/BottomTabProvider.tsx b/apps/mobile/src/components/layouts/tabbar/BottomTabProvider.tsx new file mode 100644 index 0000000000..484c710cb8 --- /dev/null +++ b/apps/mobile/src/components/layouts/tabbar/BottomTabProvider.tsx @@ -0,0 +1,24 @@ +import { useMemo, useState } from "react" +import { useSharedValue } from "react-native-reanimated" + +import { BottomTabHeightProvider } from "./BottomTabHeightProvider" +import { BottomTabBarBackgroundContext } from "./contexts/BottomTabBarBackgroundContext" +import { + BottomTabBarVisibleContext, + SetBottomTabBarVisibleContext, +} from "./contexts/BottomTabBarVisibleContext" + +export const BottomTabProvider = ({ children }: { children: React.ReactNode }) => { + const opacity = useSharedValue(1) + const [tabBarVisible, setTabBarVisible] = useState(true) + + return ( + ({ opacity }), [opacity])}> + + + {children} + + + + ) +} diff --git a/apps/mobile/src/components/layouts/tabbar/BottomTabs.tsx b/apps/mobile/src/components/layouts/tabbar/BottomTabs.tsx index df224d8679..167072c652 100644 --- a/apps/mobile/src/components/layouts/tabbar/BottomTabs.tsx +++ b/apps/mobile/src/components/layouts/tabbar/BottomTabs.tsx @@ -1,77 +1,25 @@ -import type { BottomTabBarProps } from "@react-navigation/bottom-tabs" -import type { ForwardRefExoticComponent } from "react" -import { forwardRef, useMemo, useRef, useState } from "react" -import type { ScrollView } from "react-native" -import { useSharedValue } from "react-native-reanimated" +import { useContext, useRef } from "react" -import { BottomTabHeightProvider } from "./BottomTabHeightProvider" -import { - AttachNavigationScrollViewContext, - SetAttachNavigationScrollViewContext, -} from "./contexts/AttachNavigationScrollViewContext" import { BottomTabBarBackgroundContext } from "./contexts/BottomTabBarBackgroundContext" -import { - BottomTabBarVisibleContext, - SetBottomTabBarVisibleContext, -} from "./contexts/BottomTabBarVisibleContext" import { useNavigationScrollToTop } from "./hooks" import { Tabbar } from "./Tabbar" -import { Tabs } from "./TabClient" -type ExtractReactForwardRefExoticComponent = - T extends React.ForwardRefExoticComponent ? P : never - -export const BottomTabs: ForwardRefExoticComponent< - Omit, "tabBar"> -> = forwardRef((props, ref) => { - const opacity = useSharedValue(1) - const [tabBarVisible, setTabBarVisible] = useState(true) - const [attachNavigationScrollViewRef, setAttachNavigationScrollViewRef] = - useState | null>(null) - - const currentTarget = useRef(undefined) - const scrollToTop = useNavigationScrollToTop(attachNavigationScrollViewRef) +export const BottomTabs = () => { + const currentIndex = useRef(undefined) + const scrollToTop = useNavigationScrollToTop() + const { opacity } = useContext(BottomTabBarBackgroundContext) return ( - - - ({ opacity }), [opacity])}> - - - - { - if (props.screenListeners && "tabPress" in props.screenListeners) { - props.screenListeners.tabPress!(e) - } + { + opacity.value = 1 - if (currentTarget.current === e.target) { - scrollToTop() - return - } + if (currentIndex.current === index) { + scrollToTop() + return + } - opacity.value = 1 - currentTarget.current = e.target - }, - transitionStart: (e) => { - if (props.screenListeners && "transitionStart" in props.screenListeners) { - props.screenListeners.transitionStart!(e) - } - currentTarget.current = e.target - opacity.value = 1 - }, - }} - ref={ref} - /> - - - - - - + currentIndex.current = index + }} + /> ) -}) -const TabBar = (props: BottomTabBarProps) => +} diff --git a/apps/mobile/src/components/layouts/tabbar/TabClient.tsx b/apps/mobile/src/components/layouts/tabbar/TabClient.tsx deleted file mode 100644 index 6fbceb7027..0000000000 --- a/apps/mobile/src/components/layouts/tabbar/TabClient.tsx +++ /dev/null @@ -1,55 +0,0 @@ -// @see https://github.com/expo/expo/blob/main/packages/expo-router/src/layouts/TabsClient.tsx -import type { - BottomTabNavigationEventMap, - BottomTabNavigationOptions, -} from "@react-navigation/bottom-tabs" -import { createBottomTabNavigator } from "@react-navigation/bottom-tabs" -import type { ParamListBase, TabNavigationState } from "@react-navigation/native" -import type { Href } from "expo-router" -import { Link, withLayoutContext } from "expo-router" -import * as React from "react" - -// This is the only way to access the navigator. -const BottomTabNavigator = createBottomTabNavigator().Navigator - -type TabsProps = BottomTabNavigationOptions & { href?: Href | null } - -export const Tabs = withLayoutContext< - TabsProps, - typeof BottomTabNavigator, - TabNavigationState, - BottomTabNavigationEventMap ->(BottomTabNavigator, (screens) => { - // Support the `href` shortcut prop. - return screens.map((screen) => { - if (typeof screen.options !== "function" && screen.options?.href !== undefined) { - const { href, ...options } = screen.options - - return { - ...screen, - options: { - ...options, - tabBarItemStyle: options.tabBarItemStyle, - tabBarButton: (props) => { - if (href == null) { - return null - } - - // TODO: React Navigation types these props as Animated.WithAnimatedValue> - // While Link expects a TextStyle. We need to reconcile these types. - return ( - - ) - }, - }, - } - } - return screen - }) -}) diff --git a/apps/mobile/src/components/layouts/tabbar/Tabbar.tsx b/apps/mobile/src/components/layouts/tabbar/Tabbar.tsx index 1ff0598ee5..ad73ae76bb 100644 --- a/apps/mobile/src/components/layouts/tabbar/Tabbar.tsx +++ b/apps/mobile/src/components/layouts/tabbar/Tabbar.tsx @@ -1,8 +1,6 @@ -import type { BottomTabBarProps } from "@react-navigation/bottom-tabs" -import { getLabel } from "@react-navigation/elements" -import { CommonActions, NavigationContext, NavigationRouteContext } from "@react-navigation/native" +import { useAtom, useAtomValue } from "jotai" import type { FC } from "react" -import { Fragment, memo, useContext, useEffect } from "react" +import { memo, useContext, useEffect, useMemo } from "react" import type { StyleProp, TextStyle } from "react-native" import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import Animated, { @@ -15,6 +13,9 @@ import { useSafeAreaInsets } from "react-native-safe-area-context" import { SetBottomTabBarHeightContext } from "@/src/components/layouts/tabbar/contexts/BottomTabBarHeightContext" import { gentleSpringPreset, quickSpringPreset, softSpringPreset } from "@/src/constants/spring" +import { BottomTabContext } from "@/src/lib/navigation/bottom-tab/BottomTabContext" +import type { TabScreenProps } from "@/src/lib/navigation/bottom-tab/TabScreen" +import type { TabbarIconProps } from "@/src/lib/navigation/bottom-tab/types" import { PlayerTabBar } from "@/src/modules/player/PlayerTabBar" import { accentColor } from "@/src/theme/colors" @@ -23,15 +24,19 @@ import { Grid } from "../../ui/grid" import { BottomTabBarBackgroundContext } from "./contexts/BottomTabBarBackgroundContext" import { BottomTabBarVisibleContext } from "./contexts/BottomTabBarVisibleContext" -export const Tabbar: FC = (props) => { - const { state, navigation, descriptors } = props - const { routes } = state +export const Tabbar: FC<{ + onPress?: (index: number) => void +}> = ({ onPress: onPressProp }) => { const setTabBarHeight = useContext(SetBottomTabBarHeightContext) const insets = useSafeAreaInsets() const tabBarVisible = useContext(BottomTabBarVisibleContext) + const tabContext = useContext(BottomTabContext) + const tabScreens = useAtomValue(tabContext.tabScreensAtom) + const [selectedIndex, setSelectedIndex] = useAtom(tabContext.currentIndexAtom) const translateY = useSharedValue(0) + useEffect(() => { cancelAnimation(translateY) translateY.value = withSpring( @@ -39,12 +44,20 @@ export const Tabbar: FC = (props) => { !tabBarVisible ? quickSpringPreset : softSpringPreset, ) }, [tabBarVisible, translateY]) + + const placeholderTabScreens = useMemo(() => { + return [{ tabScreenIndex: 0, title: "", renderIcon: () => }] + }, []) + + const renderTabScreens = tabScreens.length > 0 ? tabScreens : placeholderTabScreens + return ( 0 ? "auto" : "none"} accessibilityRole="tablist" className="absolute inset-x-0 bottom-0 z-10" style={{ - paddingBottom: insets.bottom, + paddingBottom: Math.max(insets.bottom, 8), transform: [{ translateY }], }} onLayout={(e) => { @@ -52,39 +65,24 @@ export const Tabbar: FC = (props) => { }} > + - - {routes.map((route, index) => { - const focused = index === state.index - const { options } = descriptors[route.key]! + + {renderTabScreens.map((route, index) => { + const focused = index === selectedIndex const inactiveTintColor = "#999" const onPress = () => { - const event = navigation.emit({ - type: "tabPress", - target: route.key, - canPreventDefault: true, - }) - - if (!focused && !event.defaultPrevented) { - navigation.dispatch({ - ...CommonActions.navigate(route), - target: state.key, - }) - } + setSelectedIndex(index) + onPressProp?.(index) } - const tabButton = options?.tabBarButton - const label = - typeof options?.tabBarLabel === "function" - ? options?.tabBarLabel - : getLabel({ label: options?.tabBarLabel, title: options?.title }, route.name) + + const label = route.title const accessibilityLabel = - options?.tabBarAccessibilityLabel !== undefined - ? options?.tabBarAccessibilityLabel - : typeof label === "string" && Platform.OS === "ios" - ? `${label}, tab, ${index + 1} of ${routes.length}` - : undefined + typeof label === "string" && Platform.OS === "ios" + ? `${label}, tab, ${index + 1} of ${tabScreens.length}` + : undefined const renderIcon = ({ focused }: { focused: boolean }) => { const iconSize = ICON_SIZE_ROUND @@ -93,31 +91,12 @@ export const Tabbar: FC = (props) => { focused={focused} iconSize={iconSize} inactiveTintColor={inactiveTintColor} - renderIcon={options.tabBarIcon!} + renderIcon={route.renderIcon! || noop} /> ) } const renderLabel = ({ focused }: { focused: boolean }) => { - const color = focused ? accentColor : accentColor - - if (typeof label !== "string") { - const labelString = getLabel( - { - label: typeof options?.tabBarLabel === "string" ? options.tabBarLabel : undefined, - title: options?.title, - }, - route.name, - ) - - return label({ - focused, - color, - position: "beside-icon", - children: labelString, - }) - } - return ( = (props) => { ) } - const TabButton = tabButton ?? Fragment return ( - - - + ) })} @@ -178,7 +154,7 @@ const TabIcon = ({ focused: boolean iconSize: number inactiveTintColor: string - renderIcon: (options: { focused: boolean; size: number; color: string }) => React.ReactNode + renderIcon: (options: TabbarIconProps) => React.ReactNode }) => { const activeOpacity = focused ? 1 : 0 const inactiveOpacity = focused ? 0 : 1 @@ -260,7 +236,6 @@ const styles = StyleSheet.create({ }, }) -const AnimatedThemedBlurView = Animated.createAnimatedComponent(ThemedBlurView) const TabBarBackground = () => { const { opacity } = useContext(BottomTabBarBackgroundContext) @@ -273,9 +248,11 @@ const TabBarBackground = () => { })) return ( - + + + void originalRenderIcon: (scene: { route: any; focused: boolean }) => React.ReactNode originalRenderLabel: (scene: { route: any; focused: boolean }) => React.ReactNode @@ -316,26 +293,24 @@ const TabItem = memo( const scene = { route, focused } return ( - - - { - pressed.value = withSpring(1, gentleSpringPreset) - }} - onPressOut={() => { - pressed.value = withSpring(0, gentleSpringPreset) - }} - className="flex-1 flex-col items-center justify-center" - accessibilityLabel={accessibilityLabel} - accessibilityRole="button" - accessibilityState={{ selected: focused }} - > - {originalRenderIcon(scene)} - {originalRenderLabel(scene)} - - - + { + pressed.value = withSpring(1, gentleSpringPreset) + }} + onPressOut={() => { + pressed.value = withSpring(0, gentleSpringPreset) + }} + className="flex-1 flex-col items-center justify-center" + accessibilityLabel={accessibilityLabel} + accessibilityRole="button" + accessibilityState={{ selected: focused }} + > + {originalRenderIcon(scene)} + {originalRenderLabel(scene)} + ) }, ) + +const noop = () => null diff --git a/apps/mobile/src/components/layouts/tabbar/hooks.ts b/apps/mobile/src/components/layouts/tabbar/hooks.ts index 046826358f..2eafaa9685 100644 --- a/apps/mobile/src/components/layouts/tabbar/hooks.ts +++ b/apps/mobile/src/components/layouts/tabbar/hooks.ts @@ -1,15 +1,15 @@ -import { useNavigation } from "expo-router" import type { RefObject } from "react" import { useCallback, useContext, useEffect, useRef } from "react" import type { FlatList, ScrollView } from "react-native" import { findNodeHandle, Platform } from "react-native" import { performNativeScrollToTop } from "@/src/lib/native" - import { SetAttachNavigationScrollViewContext, useAttachNavigationScrollView, -} from "./contexts/AttachNavigationScrollViewContext" +} from "@/src/lib/navigation/AttachNavigationScrollViewContext" +import { useScreenIsAppeared } from "@/src/lib/navigation/bottom-tab/hooks" + import { BottomTabBarHeightContext } from "./contexts/BottomTabBarHeightContext" export const useBottomTabBarHeight = () => { @@ -55,17 +55,15 @@ export const useNavigationScrollToTop = ( export const useRegisterNavigationScrollView = (active = true) => { const scrollViewRef = useRef(null) - const navigation = useNavigation() + const tabScreenIsFocused = useScreenIsAppeared() const setAttachNavigationScrollViewRef = useContext(SetAttachNavigationScrollViewContext) + useEffect(() => { if (!active) return if (!setAttachNavigationScrollViewRef) return + if (!tabScreenIsFocused) return setAttachNavigationScrollViewRef(scrollViewRef as unknown as RefObject) - const unsubscribe = navigation.addListener("focus", () => { - setAttachNavigationScrollViewRef(scrollViewRef as unknown as RefObject) - }) - return unsubscribe - }, [setAttachNavigationScrollViewRef, scrollViewRef, active, navigation]) + }, [setAttachNavigationScrollViewRef, scrollViewRef, active, tabScreenIsFocused]) return scrollViewRef } diff --git a/apps/mobile/src/components/layouts/utils/index.tsx b/apps/mobile/src/components/layouts/utils/index.tsx index c52d867b86..9ca411d584 100644 --- a/apps/mobile/src/components/layouts/utils/index.tsx +++ b/apps/mobile/src/components/layouts/utils/index.tsx @@ -18,7 +18,7 @@ export function getDefaultHeaderHeight( const isLandscape = layout.width > layout.height - if (Platform.OS === "ios" && (Platform.isPad || Platform.isTV)) { + if (Platform.OS === "ios" && Platform.isPad) { if (modalPresentation) { headerHeight = 56 } else { diff --git a/apps/mobile/src/components/layouts/views/NavigationContext.tsx b/apps/mobile/src/components/layouts/views/NavigationContext.tsx deleted file mode 100644 index a4f29ead9d..0000000000 --- a/apps/mobile/src/components/layouts/views/NavigationContext.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import { createContext } from "react" -import type { Animated } from "react-native" - -export const NavigationContext = createContext<{ - scrollY: Animated.Value -} | null>(null) diff --git a/apps/mobile/src/components/layouts/views/SafeNavigationScrollView.tsx b/apps/mobile/src/components/layouts/views/SafeNavigationScrollView.tsx index 35f1a20bf2..4e082bdfea 100644 --- a/apps/mobile/src/components/layouts/views/SafeNavigationScrollView.tsx +++ b/apps/mobile/src/components/layouts/views/SafeNavigationScrollView.tsx @@ -1,36 +1,28 @@ import { useTypeScriptHappyCallback } from "@follow/hooks" -import type { NativeStackNavigationOptions } from "@react-navigation/native-stack" -import { Stack } from "expo-router" -import type { FC, PropsWithChildren } from "react" -import { useContext, useEffect, useMemo, useRef, useState } from "react" -import type { - NativeScrollEvent, - NativeSyntheticEvent, - ScrollView, - ScrollViewProps, -} from "react-native" -import { Animated as RNAnimated, useAnimatedValue, View } from "react-native" +import { useSetAtom, useStore } from "jotai" +import type { PropsWithChildren } from "react" +import { forwardRef, useContext, useEffect, useState } from "react" +import type { ScrollView, ScrollViewProps, StyleProp, ViewStyle } from "react-native" +import { View } from "react-native" import type { SharedValue } from "react-native-reanimated" +import { useAnimatedScrollHandler } from "react-native-reanimated" import type { ReanimatedScrollEvent } from "react-native-reanimated/lib/typescript/hook/commonTypes" import { useSafeAreaFrame, useSafeAreaInsets } from "react-native-safe-area-context" -import { - AttachNavigationScrollViewContext, - SetAttachNavigationScrollViewContext, -} from "@/src/components/layouts/tabbar/contexts/AttachNavigationScrollViewContext" import { useBottomTabBarHeight } from "@/src/components/layouts/tabbar/hooks" +import { useScreenIsInSheetModal } from "@/src/lib/navigation/hooks" +import { ScreenItemContext } from "@/src/lib/navigation/ScreenItemContext" -import { AnimatedScrollView } from "../../common/AnimatedComponents" +import { ReAnimatedScrollView } from "../../common/AnimatedComponents" +import type { InternalNavigationHeaderProps } from "../header/NavigationHeader" import { InternalNavigationHeader } from "../header/NavigationHeader" import { getDefaultHeaderHeight } from "../utils" -import { NavigationContext } from "./NavigationContext" import { NavigationHeaderHeightContext, SetNavigationHeaderHeightContext, } from "./NavigationHeaderContext" type SafeNavigationScrollViewProps = Omit & { - withHeaderBlur?: boolean onScroll?: (e: ReanimatedScrollEvent) => void // For scroll view content adjustment behavior @@ -39,53 +31,63 @@ type SafeNavigationScrollViewProps = Omit & { // to sharedValue reanimatedScrollY?: SharedValue -} & PropsWithChildren - -export const SafeNavigationScrollView: FC = ({ - children, - - withHeaderBlur = true, - onScroll, - - withBottomInset = false, - withTopInset = false, - reanimatedScrollY, - - ...props -}) => { - const insets = useSafeAreaInsets() - const tabBarHeight = useBottomTabBarHeight() - - const scrollY = useAnimatedValue(0) - const scrollViewRef = useRef(null) - - const setAttachNavigationScrollViewRef = useContext(SetAttachNavigationScrollViewContext) - useEffect(() => { - if (setAttachNavigationScrollViewRef) { - setAttachNavigationScrollViewRef(scrollViewRef) - } - }, [setAttachNavigationScrollViewRef, scrollViewRef]) - const frame = useSafeAreaFrame() - const [headerHeight, setHeaderHeight] = useState(() => - getDefaultHeaderHeight(frame, false, insets.top), - ) + contentViewStyle?: StyleProp + contentViewClassName?: string +} & PropsWithChildren - return ( - ({ scrollY }), [scrollY])}> +export const SafeNavigationScrollView = forwardRef( + ( + { + children, + onScroll, + withBottomInset = false, + withTopInset = false, + reanimatedScrollY, + contentViewClassName, + contentViewStyle, + ...props + }, + ref, + ) => { + const insets = useSafeAreaInsets() + const tabBarHeight = useBottomTabBarHeight() + + const frame = useSafeAreaFrame() + const sheetModal = useScreenIsInSheetModal() + const [headerHeight, setHeaderHeight] = useState(() => + getDefaultHeaderHeight(frame, sheetModal, insets.top), + ) + const screenCtxValue = useContext(ScreenItemContext) + + const scrollHandler = useAnimatedScrollHandler({ + onScroll: (event) => { + if (reanimatedScrollY) { + reanimatedScrollY.value = event.contentOffset.y + } + + screenCtxValue.reAnimatedScrollY.value = event.contentOffset.y + }, + }) + + return ( - {withHeaderBlur && } - ) { - if (reanimatedScrollY) { - reanimatedScrollY.value = event.nativeEvent.contentOffset.y - } + { + screenCtxValue.scrollViewContentHeight.value = h + }, + [screenCtxValue.scrollViewContentHeight], + )} + onLayout={useTypeScriptHappyCallback( + (e) => { + screenCtxValue.scrollViewHeight.value = e.nativeEvent.layout.height - headerHeight }, - })} + [screenCtxValue.scrollViewHeight, headerHeight], + )} automaticallyAdjustContentInsets={false} automaticallyAdjustsScrollIndicatorInsets={false} scrollIndicatorInsets={{ @@ -95,66 +97,65 @@ export const SafeNavigationScrollView: FC = ({ {...props} > - - {children} - + + {children} + - + - - ) -} + ) + }, +) export const NavigationBlurEffectHeader = ({ headerHideableBottom, headerHideableBottomHeight, headerTitleAbsolute, ...props -}: NativeStackNavigationOptions & { +}: InternalNavigationHeaderProps & { blurThreshold?: number headerHideableBottomHeight?: number headerHideableBottom?: () => React.ReactNode headerTitleAbsolute?: boolean }) => { - const navigationContext = useContext(NavigationContext)! - const setHeaderHeight = useContext(SetNavigationHeaderHeightContext) const hideableBottom = headerHideableBottom?.() - const { headerLeft, ...rest } = props - - return ( - ( - - - - - - ), - [hideableBottom, navigationContext], - ), - - ...rest, - }} - /> - ) + const setSlot = useSetAtom(screenCtxValue.Slot) + const store = useStore() + useEffect(() => { + setSlot({ + ...store.get(screenCtxValue.Slot), + header: ( + + + + ), + }) + }, [ + screenCtxValue.Slot, + headerHideableBottomHeight, + headerTitleAbsolute, + hideableBottom, + props.headerLeft, + props.headerRight, + props.title, + setHeaderHeight, + setSlot, + store, + props.headerTitle, + ]) + + return null } diff --git a/apps/mobile/src/components/native/webview/EntryContentWebView.tsx b/apps/mobile/src/components/native/webview/EntryContentWebView.tsx index 442f4369e4..6261996132 100644 --- a/apps/mobile/src/components/native/webview/EntryContentWebView.tsx +++ b/apps/mobile/src/components/native/webview/EntryContentWebView.tsx @@ -1,4 +1,5 @@ import { clsx } from "@follow/utils" +import { Portal } from "@gorhom/portal" import { requireNativeView } from "expo" import { useAtom } from "jotai" import * as React from "react" @@ -10,7 +11,6 @@ import { useUISettingKey } from "@/src/atoms/settings/ui" import { BugCuteReIcon } from "@/src/icons/bug_cute_re" import type { EntryModel } from "@/src/store/entry/types" -import { Portal } from "../../ui/portal" import { sharedWebViewHeightAtom } from "./atom" import { htmlUrl } from "./constants" import { prepareEntryRenderWebView, SharedWebViewModule } from "./index" diff --git a/apps/mobile/src/components/ui/avatar/UserAvatar.tsx b/apps/mobile/src/components/ui/avatar/UserAvatar.tsx index 93f0b37d74..da569ef283 100644 --- a/apps/mobile/src/components/ui/avatar/UserAvatar.tsx +++ b/apps/mobile/src/components/ui/avatar/UserAvatar.tsx @@ -12,7 +12,8 @@ interface UserAvatarProps { name?: string | null className?: string color?: string - noPreview?: boolean + + preview?: boolean } export const UserAvatar = ({ @@ -21,7 +22,7 @@ export const UserAvatar = ({ name, className, color, - noPreview, + preview = true, }: UserAvatarProps) => { if (!image) { return ( @@ -60,11 +61,11 @@ export const UserAvatar = ({ /> ) - return noPreview ? ( - imageContent - ) : ( + return preview ? ( {imageContent} + ) : ( + imageContent ) } diff --git a/apps/mobile/src/components/ui/form/PickerIos.tsx b/apps/mobile/src/components/ui/form/PickerIos.tsx index 8f7ff4da1e..bf8cbe5eab 100644 --- a/apps/mobile/src/components/ui/form/PickerIos.tsx +++ b/apps/mobile/src/components/ui/form/PickerIos.tsx @@ -1,5 +1,6 @@ /* eslint-disable @eslint-react/no-array-index-key */ import { cn } from "@follow/utils" +import { Portal } from "@gorhom/portal" import { Picker } from "@react-native-picker/picker" import { useMemo, useState } from "react" import type { StyleProp, ViewStyle } from "react-native" @@ -11,7 +12,6 @@ import { MingcuteDownLineIcon } from "@/src/icons/mingcute_down_line" import { useColor } from "@/src/theme/colors" import { BlurEffect } from "../../common/BlurEffect" -import { Portal } from "../portal" interface PickerIosProps { options: { label: string; value: T }[] diff --git a/apps/mobile/src/components/ui/form/Select.tsx b/apps/mobile/src/components/ui/form/Select.tsx index b876622985..844b499a94 100644 --- a/apps/mobile/src/components/ui/form/Select.tsx +++ b/apps/mobile/src/components/ui/form/Select.tsx @@ -62,7 +62,7 @@ export function Select({ ellipsizeMode="middle" numberOfLines={1} > - {valueToLabelMap.get(currentValue)} + {valueToLabelMap.get(currentValue) || "Select"} diff --git a/apps/mobile/src/components/ui/grid/index.tsx b/apps/mobile/src/components/ui/grid/index.tsx index e8fb87b3f2..2d61e19313 100644 --- a/apps/mobile/src/components/ui/grid/index.tsx +++ b/apps/mobile/src/components/ui/grid/index.tsx @@ -20,6 +20,9 @@ export const Grid = ({ style, className, }: GridProps & PropsWithChildren) => { + if (columns < 1) { + throw new Error("Columns must be greater than 0") + } const rowsChildren = useMemo(() => { const childrenArray = React.Children.toArray(children) const rows = [] diff --git a/apps/mobile/src/components/ui/grouped/GroupedInsetListCardItemStyle.tsx b/apps/mobile/src/components/ui/grouped/GroupedInsetListCardItemStyle.tsx new file mode 100644 index 0000000000..0582b66278 --- /dev/null +++ b/apps/mobile/src/components/ui/grouped/GroupedInsetListCardItemStyle.tsx @@ -0,0 +1,3 @@ +export enum GroupedInsetListCardItemStyle { + NavigationLink = "NavigationLink", +} diff --git a/apps/mobile/src/components/ui/grouped/GroupedList.tsx b/apps/mobile/src/components/ui/grouped/GroupedList.tsx index f7af1a7ad0..83ccb503fc 100644 --- a/apps/mobile/src/components/ui/grouped/GroupedList.tsx +++ b/apps/mobile/src/components/ui/grouped/GroupedList.tsx @@ -10,11 +10,18 @@ import { CheckFilledIcon } from "@/src/icons/check_filled" import { MingcuteRightLine } from "@/src/icons/mingcute_right_line" import { accentColor, useColor } from "@/src/theme/colors" -export enum GroupedInsetListCardItemStyle { - NavigationLink = "NavigationLink", -} -type GroupedInsetListCardProps = { +import { + GROUPED_ICON_TEXT_GAP, + GROUPED_LIST_ITEM_PADDING, + GROUPED_LIST_MARGIN, + GROUPED_SECTION_BOTTOM_MARGIN, + GROUPED_SECTION_TOP_MARGIN, +} from "./constants" +import { GroupedInsetListCardItemStyle } from "./GroupedInsetListCardItemStyle" + +interface GroupedInsetListCardProps { showSeparator?: boolean + SeparatorComponent?: FC } interface BaseCellClassNames { @@ -30,12 +37,13 @@ export const GroupedOutlineDescription: FC<{ export const GroupedInsetListCard: FC< PropsWithChildren & ViewProps & GroupedInsetListCardProps -> = ({ children, className, showSeparator = true, ...props }) => { +> = ({ children, className, showSeparator = true, SeparatorComponent, ...props }) => { return ( @@ -53,12 +61,15 @@ export const GroupedInsetListCard: FC< return ( {child} - {!isLast && ( - - )} + {!isLast && + (SeparatorComponent ? ( + + ) : ( + + ))} ) }) @@ -69,9 +80,18 @@ export const GroupedInsetListCard: FC< export const GroupedInsetListSectionHeader: FC<{ label: string -}> = ({ label }) => { + marginSize?: "normal" | "small" +}> = ({ label, marginSize = "normal" }) => { return ( - + {label} @@ -79,17 +99,21 @@ export const GroupedInsetListSectionHeader: FC<{ ) } -export const GroupedInsetListBaseCell: FC = ({ - children, - ...props -}) => { +export const GroupedInsetListBaseCell: FC< + PropsWithChildren & + ViewProps & { + as?: FC + } +> = ({ children, as, ...props }) => { + const Component = as ?? View return ( - {children} - + ) } @@ -133,8 +157,9 @@ export const GroupedInsetListNavigationLinkIcon: FC< > = ({ backgroundColor, children }) => { return ( @@ -193,6 +218,32 @@ export const GroupedInsetListActionCellRadio: FC<{ ) } +const OverlayInterectionPressable = ({ + children, + ...props +}: PropsWithChildren & PressableProps) => { + return ( + + {({ pressed }) => { + return ( + <> + {/* Pressed Overlay Effect */} + {pressed && ( + + )} + + {children} + + ) + }} + + ) +} + export const GroupedInsetListActionCell: FC<{ label: string description?: string @@ -282,24 +333,8 @@ export const GroupedPlainButtonCell: FC< } & PressableProps > = ({ label, textClassName, ...props }) => { return ( - - - {({ pressed }) => { - return ( - - {/* Pressed Overlay Effect */} - {pressed && ( - - )} - {label} - - ) - }} - + + {label} ) } diff --git a/apps/mobile/src/components/ui/grouped/constants.ts b/apps/mobile/src/components/ui/grouped/constants.ts new file mode 100644 index 0000000000..00aa74996c --- /dev/null +++ b/apps/mobile/src/components/ui/grouped/constants.ts @@ -0,0 +1,11 @@ +import { PixelRatio } from "react-native" + +const pixelRatio = PixelRatio.get() +export const GROUPED_ICON_TEXT_GAP = 36 / pixelRatio + +export const GROUPED_LIST_MARGIN = 48 / pixelRatio + +export const GROUPED_LIST_ITEM_PADDING = 52 / pixelRatio + +export const GROUPED_SECTION_TOP_MARGIN = 87 / pixelRatio +export const GROUPED_SECTION_BOTTOM_MARGIN = 36 / pixelRatio diff --git a/apps/mobile/src/components/ui/portal/Portal.tsx b/apps/mobile/src/components/ui/portal/Portal.tsx deleted file mode 100644 index e82525081c..0000000000 --- a/apps/mobile/src/components/ui/portal/Portal.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import * as React from "react" -import { useEffect, useMemo, useRef } from "react" - -import PortalContext from "./PortalContext" -import type { IPortalMethods, PortalConsumerProps } from "./type" - -const PortalConsumer: React.FC = (props) => { - const id = React.useId() - const key = useRef(id) - const once = useRef(false) - - useEffect( - () => () => { - const { manager } = props - manager?.unmount?.(key.current) - }, - - [], - ) - - useEffect(() => { - const { manager, children } = props - if (!once.current) { - once.current = true - key.current = manager?.mount?.(children) ?? "" - } else { - manager?.update?.(key.current, children) - } - }, [props]) - - return null -} - -export function Portal({ children }: React.PropsWithChildren) { - return useMemo( - () => ( - - {(manager: IPortalMethods | null): React.ReactNode => ( - {children} - )} - - ), - [children], - ) -} - -export { PortalConsumerProps, PortalProps } from "./type" diff --git a/apps/mobile/src/components/ui/portal/PortalContext.tsx b/apps/mobile/src/components/ui/portal/PortalContext.tsx deleted file mode 100644 index 1a7b607e65..0000000000 --- a/apps/mobile/src/components/ui/portal/PortalContext.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import * as React from "react" - -import type { IPortalMethods } from "./type" - -export default React.createContext(null) diff --git a/apps/mobile/src/components/ui/portal/PortalHost.tsx b/apps/mobile/src/components/ui/portal/PortalHost.tsx deleted file mode 100644 index 40a38b87c9..0000000000 --- a/apps/mobile/src/components/ui/portal/PortalHost.tsx +++ /dev/null @@ -1,87 +0,0 @@ -import * as React from "react" -import { useCallback, useMemo, useRef } from "react" - -import PortalContext from "./PortalContext" -import PortalManager from "./PortalManager" -import type { IPortalManager, Operation, PortalKey } from "./type" - -interface PortalHostProps { - children: React.ReactNode -} - -export function PortalHost(props: PortalHostProps) { - const id = React.useId() - const nextKey = useRef(0) - const queue = useRef([]) - const manager = useRef() - - const mount = useCallback((children: React.ReactNode, _key?: PortalKey) => { - let key = _key - if (!key) { - nextKey.current++ - key = `${id}-${nextKey.current}` - } - - if (manager.current) { - manager.current.mount(key, children) - } else { - queue.current.push({ type: "mount", key, children }) - } - - return key - }, []) - - const update = useCallback((key: PortalKey, children: React.ReactNode) => { - if (manager.current) { - manager.current.update(key, children) - } else { - const op: Operation = { type: "mount", key, children } - const index = queue.current.findIndex( - (o) => o.type === "mount" || (o.type === "update" && o.key === key), - ) - - if (index !== -1) { - queue.current[index] = op - } else { - queue.current.push(op) - } - } - }, []) - - const unmount = useCallback((key: PortalKey) => { - if (manager.current) { - manager.current.unmount(key) - } else { - queue.current.push({ type: "unmount", key }) - } - }, []) - - const { children } = props - - const ctxValue = useMemo( - () => ({ - mount, - update, - unmount, - }), - [mount, update, unmount], - ) - - return useMemo( - () => ( - <> - - <> - {/* placeholder */} - {children} - {/* portal container */} - - - - - ), - [ctxValue, children], - ) -} - -PortalHost.displayName = "Portal.host" diff --git a/apps/mobile/src/components/ui/portal/PortalManager.tsx b/apps/mobile/src/components/ui/portal/PortalManager.tsx deleted file mode 100644 index bfd6cc40ba..0000000000 --- a/apps/mobile/src/components/ui/portal/PortalManager.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import * as React from "react" -import { useCallback, useImperativeHandle, useMemo, useState } from "react" -import { StyleSheet, View } from "react-native" - -export default React.forwardRef((_, ref: any) => { - const [portals, setPortals] = useState<{ key: number; children: React.ReactNode }[]>([]) - - const mount = useCallback((key: number, children: React.ReactNode) => { - setPortals((oldPortals) => [...oldPortals, { key, children }]) - }, []) - - const update = useCallback((key: number, children: React.ReactNode) => { - setPortals((oldPortals) => - oldPortals.map((item) => { - if (item.key === key) { - return { ...item, children } - } - return { ...item } - }), - ) - }, []) - - const unmount = useCallback( - (key: number) => setPortals((oldPortals) => oldPortals.filter((item) => item.key !== key)), - [], - ) - - useImperativeHandle(ref, () => ({ - mount, - update, - unmount, - })) - - return useMemo( - () => ( - <> - {portals.map(({ key, children }) => ( - - {children} - - ))} - - ), - [portals], - ) -}) diff --git a/apps/mobile/src/components/ui/portal/index.tsx b/apps/mobile/src/components/ui/portal/index.tsx deleted file mode 100644 index d2c1dd9dea..0000000000 --- a/apps/mobile/src/components/ui/portal/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export { Portal } from "./Portal" -export { PortalHost } from "./PortalHost" diff --git a/apps/mobile/src/components/ui/portal/type.ts b/apps/mobile/src/components/ui/portal/type.ts deleted file mode 100644 index 1ebc2963af..0000000000 --- a/apps/mobile/src/components/ui/portal/type.ts +++ /dev/null @@ -1,44 +0,0 @@ -import type * as React from "react" - -export type PortalKey = string -export interface IPortalManager { - mount: (key: PortalKey, children: React.ReactNode) => void - update: (key: PortalKey, children: React.ReactNode) => void - unmount: (key: PortalKey) => void -} - -export interface IPortalMethods { - mount: (children: React.ReactNode) => PortalKey - update: (key: PortalKey, children: React.ReactNode) => void - unmount: (key: PortalKey) => void -} - -export type Operation = - | { - type: "mount" - key: PortalKey - children: React.ReactNode - } - | { - type: "update" - key: PortalKey - children: React.ReactNode - } - | { - type: "unmount" - key: PortalKey - } - -export interface IStaticContainerProps { - shouldUpdate: boolean - children: React.ReactNode -} - -export interface PortalProps { - children?: React.ReactNode -} - -export interface PortalConsumerProps { - manager: IPortalMethods | null - children: React.ReactNode -} diff --git a/apps/mobile/src/components/ui/pressable/ItemPressable.tsx b/apps/mobile/src/components/ui/pressable/ItemPressable.tsx index 4aab7edf6c..175b6cb577 100644 --- a/apps/mobile/src/components/ui/pressable/ItemPressable.tsx +++ b/apps/mobile/src/components/ui/pressable/ItemPressable.tsx @@ -20,10 +20,11 @@ import { ItemPressableStyle } from "./enum" interface ItemPressableProps extends PressableProps { itemStyle?: ItemPressableStyle + touchHighlight?: boolean } export const ItemPressable: FC = memo( - ({ children, itemStyle = ItemPressableStyle.Grouped, ...props }) => { + ({ children, itemStyle = ItemPressableStyle.Grouped, touchHighlight = true, ...props }) => { const [isPressing, setIsPressing] = useState(false) const secondarySystemGroupedBackground = useColor("secondarySystemGroupedBackground") @@ -36,13 +37,14 @@ export const ItemPressable: FC = memo( const pressed = useSharedValue(0) useEffect(() => { + if (!touchHighlight) return cancelAnimation(pressed) if (isPressing) { pressed.value = withSpring(1, { duration: 0.2 }) } else { pressed.value = withSpring(0, gentleSpringPreset) } - }, [isPressing, pressed]) + }, [isPressing, pressed, touchHighlight]) const colorStyle = useAnimatedStyle(() => { return { @@ -60,14 +62,16 @@ export const ItemPressable: FC = memo( // https://github.com/nandorojo/zeego/issues/61 onLongPress={composeEventHandlers(props.onLongPress, () => {})} delayLongPress={props.delayLongPress ?? 100} - className={cn(props.className, "relative")} + className={cn("relative overflow-hidden", props.className)} style={StyleSheet.flatten([props.style, { backgroundColor: itemNormalColor }])} > {useTypeScriptHappyCallback( (props) => { return ( - + {touchHighlight && ( + + )} {typeof children === "function" ? children(props) : children} ) diff --git a/apps/mobile/src/hooks/useIntentHandler.ts b/apps/mobile/src/hooks/useIntentHandler.ts index 5f6793b651..b4d482c1c3 100644 --- a/apps/mobile/src/hooks/useIntentHandler.ts +++ b/apps/mobile/src/hooks/useIntentHandler.ts @@ -1,7 +1,9 @@ import * as Linking from "expo-linking" -import { router } from "expo-router" import { useEffect } from "react" +import { useNavigation } from "../lib/navigation/hooks" +import { FollowScreen } from "../screens/(modal)/follow" + // This needs to stay outside of react to persist between account switches let previousIntentUrl = "" export const resetIntentUrl = () => { @@ -11,20 +13,25 @@ export const resetIntentUrl = () => { export function useIntentHandler() { const incomingUrl = Linking.useURL() + const navigation = useNavigation() + useEffect(() => { - if (incomingUrl) { - if (previousIntentUrl === incomingUrl) return + if (incomingUrl && incomingUrl !== previousIntentUrl) { previousIntentUrl = incomingUrl - } - const searchParams = extractParamsFromDeepLink(incomingUrl) - if (!searchParams) { - console.warn("No valid params found in deep link:", incomingUrl) - return + const searchParams = extractParamsFromDeepLink(incomingUrl) + if (!searchParams) { + console.warn("No valid params found in deep link:", incomingUrl) + return + } + + navigation.presentControllerView(FollowScreen, { + id: searchParams.get("id") ?? undefined, + type: (searchParams.get("type") as "url" | "feed" | "list") ?? undefined, + url: searchParams.get("url") ?? undefined, + }) } - - router.push(`/follow?${searchParams.toString()}`) - }) + }, [incomingUrl, navigation]) } // follow://add?id=41147805276726272 diff --git a/apps/mobile/src/hooks/useIsRouteOnlyOne.ts b/apps/mobile/src/hooks/useIsRouteOnlyOne.ts deleted file mode 100644 index a6d496e6ea..0000000000 --- a/apps/mobile/src/hooks/useIsRouteOnlyOne.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { useNavigation } from "expo-router" - -export const useIsRouteOnlyOne = () => { - const navigation = useNavigation() - const state = navigation.getState() - - const routeOnlyOne = state?.routes.length === 1 - - return routeOnlyOne -} diff --git a/apps/mobile/src/icons/pdf_cute_re.tsx b/apps/mobile/src/icons/pdf_cute_re.tsx new file mode 100644 index 0000000000..fa13fd1b01 --- /dev/null +++ b/apps/mobile/src/icons/pdf_cute_re.tsx @@ -0,0 +1,25 @@ +import * as React from "react" +import Svg, { Path } from "react-native-svg" + +interface PdfCuteReIconProps { + width?: number + height?: number + color?: string +} + +export const PdfCuteReIcon = ({ + width = 24, + height = 24, + color = "#10161F", +}: PdfCuteReIconProps) => { + return ( + + + + ) +} diff --git a/apps/mobile/src/interfaces/settings/general.ts b/apps/mobile/src/interfaces/settings/general.ts index 5948d6ef36..78c1ac969e 100644 --- a/apps/mobile/src/interfaces/settings/general.ts +++ b/apps/mobile/src/interfaces/settings/general.ts @@ -1,6 +1,6 @@ export interface GeneralSettings { language: string - translationLanguage: string + actionLanguage: string sendAnonymousData: boolean unreadOnly: boolean diff --git a/apps/mobile/src/lib/api-fetch.ts b/apps/mobile/src/lib/api-fetch.ts index 3e8371bdd7..51078ea277 100644 --- a/apps/mobile/src/lib/api-fetch.ts +++ b/apps/mobile/src/lib/api-fetch.ts @@ -54,7 +54,7 @@ export const apiClient = hc(proxyEnv.VITE_API_URL, { }), headers() { return { - "X-App-Name": "Follow Mobile", + "X-App-Name": "Folo Mobile", cookie: getCookie(), } }, diff --git a/apps/mobile/src/lib/dialog.tsx b/apps/mobile/src/lib/dialog.tsx index 1ccaf3bd86..924e29e475 100644 --- a/apps/mobile/src/lib/dialog.tsx +++ b/apps/mobile/src/lib/dialog.tsx @@ -13,11 +13,13 @@ import { import { Text, TouchableOpacity, View } from "react-native" import Animated, { SlideInUp, SlideOutUp } from "react-native-reanimated" import RootSiblings from "react-native-root-siblings" -import { useSafeAreaInsets } from "react-native-safe-area-context" +import { SafeAreaProvider, useSafeAreaInsets } from "react-native-safe-area-context" import { useColor } from "react-native-uikit-colors" import { FullWindowOverlay } from "../components/common/FullWindowOverlay" import { Overlay } from "../components/ui/overlay/Overlay" +import { Navigation } from "./navigation/Navigation" +import { NavigationInstanceContext } from "./navigation/NavigationInstanceContext" export interface DialogProps { title?: string @@ -192,39 +194,46 @@ class DialogStatic { const siblings = new RootSiblings( ( - - - - - - {Header} - - {children} - - - - - - - - - - + + + + + + + + {Header} + + {children} + + + + + + + + + + + + ), ) diff --git a/apps/mobile/src/lib/language.ts b/apps/mobile/src/lib/language.ts index cbcf4e61a4..d1278617f1 100644 --- a/apps/mobile/src/lib/language.ts +++ b/apps/mobile/src/lib/language.ts @@ -2,32 +2,3 @@ import type { languageSchema } from "@follow/shared/src/hono" import type { z } from "zod" export type SupportedLanguages = z.infer -export const LanguageMap: Record< - SupportedLanguages, - { - label: string - value: string - code: string - } -> = { - en: { - value: "en", - label: "English", - code: "eng", - }, - ja: { - value: "ja", - label: "Japanese", - code: "jpn", - }, - "zh-CN": { - value: "zh-CN", - label: "Simplified Chinese", - code: "cmn", - }, - "zh-TW": { - value: "zh-TW", - label: "Traditional Chinese (Taiwan)", - code: "cmn", - }, -} diff --git a/apps/mobile/src/components/layouts/tabbar/contexts/AttachNavigationScrollViewContext.tsx b/apps/mobile/src/lib/navigation/AttachNavigationScrollViewContext.tsx similarity index 100% rename from apps/mobile/src/components/layouts/tabbar/contexts/AttachNavigationScrollViewContext.tsx rename to apps/mobile/src/lib/navigation/AttachNavigationScrollViewContext.tsx diff --git a/apps/mobile/src/lib/navigation/ChainNavigationContext.tsx b/apps/mobile/src/lib/navigation/ChainNavigationContext.tsx new file mode 100644 index 0000000000..7fba003274 --- /dev/null +++ b/apps/mobile/src/lib/navigation/ChainNavigationContext.tsx @@ -0,0 +1,23 @@ +import type { PrimitiveAtom } from "jotai" +import { createContext } from "react" + +import type { + NavigationControllerView, + NavigationControllerViewExtraProps, + NavigationControllerViewType, +} from "./types" + +export interface Route { + id: string + + Component?: NavigationControllerView + element?: React.ReactElement + + type: NavigationControllerViewType + props?: unknown + screenOptions?: NavigationControllerViewExtraProps +} +export type ChainNavigationContextType = { + routesAtom: PrimitiveAtom +} +export const ChainNavigationContext = createContext(null!) diff --git a/apps/mobile/src/lib/navigation/GroupedNavigationRouteContext.ts b/apps/mobile/src/lib/navigation/GroupedNavigationRouteContext.ts new file mode 100644 index 0000000000..02853d8b4f --- /dev/null +++ b/apps/mobile/src/lib/navigation/GroupedNavigationRouteContext.ts @@ -0,0 +1,5 @@ +import { createContext } from "react" + +import type { Route } from "./ChainNavigationContext" + +export const GroupedNavigationRouteContext = createContext(null!) diff --git a/apps/mobile/src/lib/navigation/Navigation.ts b/apps/mobile/src/lib/navigation/Navigation.ts new file mode 100644 index 0000000000..ce3b1a866d --- /dev/null +++ b/apps/mobile/src/lib/navigation/Navigation.ts @@ -0,0 +1,183 @@ +import { jotaiStore } from "@follow/utils" +import { EventEmitter } from "expo" +import { atom } from "jotai" + +import type { ChainNavigationContextType, Route } from "./ChainNavigationContext" +import type { + NavigationControllerView, + NavigationControllerViewExtraProps, + NavigationControllerViewType, +} from "./types" + +export class Navigation { + private ctxValue: ChainNavigationContextType + constructor(ctxValue: ChainNavigationContextType) { + this.ctxValue = ctxValue + + this.pushControllerView = this.pushControllerView.bind(this) + this.presentControllerView = this.presentControllerView.bind(this) + this.dismiss = this.dismiss.bind(this) + this.back = this.back.bind(this) + this.popTo = this.popTo.bind(this) + this.popToRoot = this.popToRoot.bind(this) + } + + __internal_getCtxValue() { + return this.ctxValue + } + + private viewIdCounter = 0 + + static readonly rootNavigation: Navigation = new Navigation({ + routesAtom: atom([]), + }) + + private __push(route: Route) { + const routes = jotaiStore.get(this.ctxValue.routesAtom) + const hasRoute = routes.some((r) => r.id === route.id) + if (hasRoute && routes.at(-1)?.id === route.id) { + console.warn(`Top of stack is already ${route.id}`) + return + } else if (hasRoute) { + route.id = `${route.id}-${this.viewIdCounter++}` + } + jotaiStore.set(this.ctxValue.routesAtom, [...routes, route]) + this.emit("screenChange", { screenId: route.id, type: "appear", route }) + } + + private resolveScreenOptions( + view: NavigationControllerView, + ): Required { + return { + transparent: view.transparent ?? false, + id: view.id ?? view.name ?? `view-${this.viewIdCounter++}`, + title: view.title ?? "", + // Form Sheet + sheetAllowedDetents: view.sheetAllowedDetents ?? "fitToContents", + sheetCornerRadius: view.sheetCornerRadius ?? 16, + sheetExpandsWhenScrolledToEdge: view.sheetExpandsWhenScrolledToEdge ?? true, + sheetElevation: view.sheetElevation ?? 24, + sheetGrabberVisible: view.sheetGrabberVisible ?? true, + sheetInitialDetentIndex: view.sheetInitialDetentIndex ?? 0, + sheetLargestUndimmedDetentIndex: view.sheetLargestUndimmedDetentIndex ?? "medium", + } + } + + pushControllerView(view: NavigationControllerView, props?: T) { + const screenOptions = this.resolveScreenOptions(view) + this.__push({ + id: screenOptions.id, + type: "push", + Component: view, + props, + screenOptions, + }) + } + + presentControllerView( + view: NavigationControllerView, + props?: T, + type: Exclude = "modal", + ) { + const screenOptions = this.resolveScreenOptions(view) + this.__push({ + id: screenOptions.id, + type, + Component: view, + props, + screenOptions, + }) + } + private __pop() { + const routes = jotaiStore.get(this.ctxValue.routesAtom) + const lastRoute = routes.at(-1) + if (!lastRoute) { + return + } + jotaiStore.set(this.ctxValue.routesAtom, routes.slice(0, -1)) + this.emit("screenChange", { screenId: lastRoute.id, type: "disappear", route: lastRoute }) + } + + /** + * Dismiss the current modal. + */ + dismiss() { + const routes = jotaiStore.get(this.ctxValue.routesAtom) + const lastModalIndex = routes.findLastIndex((r) => r.type !== "push") + if (lastModalIndex === -1) { + return + } + jotaiStore.set(this.ctxValue.routesAtom, routes.slice(0, lastModalIndex)) + } + + back() { + return this.__pop() + } + + __internal_dismiss(routeId: string) { + const routes = jotaiStore.get(this.ctxValue.routesAtom) + const lastModalIndex = routes.findLastIndex((r) => r.id === routeId) + if (lastModalIndex === -1) { + return + } + jotaiStore.set(this.ctxValue.routesAtom, routes.slice(0, lastModalIndex)) + } + + // eslint-disable-next-line unicorn/prefer-event-target + private bus = new EventEmitter<{ + willAppear: (payload: LifecycleEventPayload) => void + didAppear: (payload: LifecycleEventPayload) => void + willDisappear: (payload: LifecycleEventPayload) => void + didDisappear: (payload: LifecycleEventPayload) => void + }>() + on(event: "willAppear", callback: (payload: LifecycleEventPayload) => void): Disposer + on(event: "didAppear", callback: (payload: LifecycleEventPayload) => void): Disposer + on(event: "willDisappear", callback: (payload: LifecycleEventPayload) => void): Disposer + on(event: "didDisappear", callback: (payload: LifecycleEventPayload) => void): Disposer + on(event: "screenChange", callback: (payload: ScreenChangeEventPayload) => void): Disposer + on(event: string, callback: (payload: any) => void): Disposer { + const subscription = this.bus.addListener(event as any, callback) + return () => { + subscription.remove() + } + } + + emit(event: "willAppear", payload: LifecycleEventPayload): void + emit(event: "didAppear", payload: LifecycleEventPayload): void + emit(event: "willDisappear", payload: LifecycleEventPayload): void + emit(event: "didDisappear", payload: LifecycleEventPayload): void + emit(event: "screenChange", payload: ScreenChangeEventPayload): void + emit(event: string, payload: LifecycleEventPayload): void { + this.bus.emit(event as any, payload) + } + + canGoBack() { + const routes = jotaiStore.get(this.ctxValue.routesAtom) + return routes.length > 0 + } + + popTo(routeId: string) { + const routes = jotaiStore.get(this.ctxValue.routesAtom) + const index = routes.findIndex((r) => r.id === routeId) + if (index === -1) { + return + } + jotaiStore.set(this.ctxValue.routesAtom, routes.slice(0, index + 1)) + } + + popToRoot() { + jotaiStore.set(this.ctxValue.routesAtom, []) + } +} + +type Disposer = () => void + +type LifecycleEventPayload = { + screenId: string +} + +type ScreenChangeEventPayload = { + screenId: string + type: "appear" | "disappear" + route?: Route +} diff --git a/apps/mobile/src/lib/navigation/NavigationInstanceContext.ts b/apps/mobile/src/lib/navigation/NavigationInstanceContext.ts new file mode 100644 index 0000000000..37be8e1618 --- /dev/null +++ b/apps/mobile/src/lib/navigation/NavigationInstanceContext.ts @@ -0,0 +1,5 @@ +import { createContext } from "react" + +import type { Navigation } from "./Navigation" + +export const NavigationInstanceContext = createContext(null!) diff --git a/apps/mobile/src/lib/navigation/NavigationLink.tsx b/apps/mobile/src/lib/navigation/NavigationLink.tsx new file mode 100644 index 0000000000..b77f7ef010 --- /dev/null +++ b/apps/mobile/src/lib/navigation/NavigationLink.tsx @@ -0,0 +1,39 @@ +import { forwardRef } from "react" +import type { TextProps } from "react-native" +import { Text } from "react-native" +import type { StackPresentationTypes } from "react-native-screens" + +import { useNavigation } from "./hooks" +import type { NavigationControllerView } from "./types" + +interface NavigationLinkProps extends TextProps { + destination: NavigationControllerView + stackPresentation?: StackPresentationTypes + props?: T +} +function NavigationLinkImpl( + { destination, children, stackPresentation = "push", props, ...rest }: NavigationLinkProps, + ref: React.Ref, +) { + const navigation = useNavigation() + + return ( + { + if (stackPresentation === "push") { + navigation.pushControllerView(destination, props) + } else { + navigation.presentControllerView(destination, props, stackPresentation) + } + }} + {...rest} + ref={ref} + > + {children} + + ) +} + +export const NavigationLink = forwardRef(NavigationLinkImpl) as ( + props: NavigationLinkProps & { ref?: React.Ref }, +) => ReturnType diff --git a/apps/mobile/src/lib/navigation/ScreenItemContext.ts b/apps/mobile/src/lib/navigation/ScreenItemContext.ts new file mode 100644 index 0000000000..c535d97ccb --- /dev/null +++ b/apps/mobile/src/lib/navigation/ScreenItemContext.ts @@ -0,0 +1,22 @@ +import type { PrimitiveAtom } from "jotai" +import type { ReactNode } from "react" +import { createContext } from "react" +import type { SharedValue } from "react-native-reanimated" + +export interface ScreenItemContextType { + screenId: string + + isFocusedAtom: PrimitiveAtom + isAppearedAtom: PrimitiveAtom + isDisappearedAtom: PrimitiveAtom + + // For Layout ScrollView + reAnimatedScrollY: SharedValue + scrollViewHeight: SharedValue + scrollViewContentHeight: SharedValue + + Slot: PrimitiveAtom<{ + header: ReactNode + }> +} +export const ScreenItemContext = createContext(null!) diff --git a/apps/mobile/src/lib/navigation/ScreenNameContext.tsx b/apps/mobile/src/lib/navigation/ScreenNameContext.tsx new file mode 100644 index 0000000000..52d8c3fb17 --- /dev/null +++ b/apps/mobile/src/lib/navigation/ScreenNameContext.tsx @@ -0,0 +1,13 @@ +import type { PrimitiveAtom } from "jotai" +import { useAtomValue } from "jotai" +import { createContext, useContext } from "react" + +export const ScreenNameContext = createContext>(null!) + +export const useScreenName = () => { + const name = useContext(ScreenNameContext) + if (!name) { + throw new Error("ScreenNameContext not mounted") + } + return useAtomValue(name) +} diff --git a/apps/mobile/src/lib/navigation/ScreenOptionsContext.ts b/apps/mobile/src/lib/navigation/ScreenOptionsContext.ts new file mode 100644 index 0000000000..a2651ea059 --- /dev/null +++ b/apps/mobile/src/lib/navigation/ScreenOptionsContext.ts @@ -0,0 +1,51 @@ +import type { PrimitiveAtom } from "jotai" +import { useStore } from "jotai" +import { createContext, useCallback, useContext } from "react" + +export interface ScreenOptionsContextType { + gestureEnabled?: boolean + preventNativeDismiss?: boolean + + nativeHeader?: boolean + headerLeftArea?: React.ReactNode + headerRightArea?: React.ReactNode + headerTitleArea?: React.ReactNode +} +export const ScreenOptionsContext = createContext>(null!) + +export const useSetScreenOptions = () => { + const ctx = useContext(ScreenOptionsContext) + if (!ctx) { + throw new Error("ScreenOptionsContext not found") + } + + const store = useStore() + return useCallback( + (options: ScreenOptionsContextType) => { + const prev = store.get(ctx) + store.set(ctx, { ...prev, ...options }) + }, + [store, ctx], + ) +} + +export const ModalScreenItemOptionsContext = createContext>( + null!, +) + +export const useSetModalScreenOptions = () => { + const ctx = useContext(ModalScreenItemOptionsContext) + + const store = useStore() + return useCallback( + (options: ScreenOptionsContextType) => { + if (!ctx) { + return + } + + const prev = store.get(ctx) + store.set(ctx, { ...prev, ...options }) + }, + [store, ctx], + ) +} diff --git a/apps/mobile/src/lib/navigation/StackNavigation.tsx b/apps/mobile/src/lib/navigation/StackNavigation.tsx new file mode 100644 index 0000000000..4e99c318c0 --- /dev/null +++ b/apps/mobile/src/lib/navigation/StackNavigation.tsx @@ -0,0 +1,244 @@ +import type { PrimitiveAtom } from "jotai" +import { atom, useAtomValue, useStore } from "jotai" +import type { FC, PropsWithChildren } from "react" +import { memo, useContext, useEffect, useMemo, useRef, useState } from "react" +import type { ScrollView } from "react-native" +import { StyleSheet } from "react-native" +import { SafeAreaProvider } from "react-native-safe-area-context" +import type { ScreenStackHeaderConfigProps } from "react-native-screens" +import { ScreenStack } from "react-native-screens" + +import { + AttachNavigationScrollViewContext, + SetAttachNavigationScrollViewContext, +} from "./AttachNavigationScrollViewContext" +import type { Route } from "./ChainNavigationContext" +import { ChainNavigationContext } from "./ChainNavigationContext" +import { GroupedNavigationRouteContext } from "./GroupedNavigationRouteContext" +import { useNavigation } from "./hooks" +import { Navigation } from "./Navigation" +import { NavigationInstanceContext } from "./NavigationInstanceContext" +import { ScreenNameContext } from "./ScreenNameContext" +import type { ScreenOptionsContextType } from "./ScreenOptionsContext" +import { ModalScreenItemOptionsContext } from "./ScreenOptionsContext" +import type { NavigationControllerView } from "./types" +import { WrappedScreenItem } from "./WrappedScreenItem" + +interface RootStackNavigationProps { + children: React.ReactNode + + headerConfig?: ScreenStackHeaderConfigProps +} +export const RootStackNavigation = ({ children, headerConfig }: RootStackNavigationProps) => { + return ( + + + atom(""), [])}> + + + + + {children} + + + + + + + + + + + ) +} + +const AttachNavigationScrollViewProvider: FC = ({ children }) => { + const [attachNavigationScrollViewRef, setAttachNavigationScrollViewRef] = + useState | null>(null) + + return ( + + + {children} + + + ) +} +const StateHandler = () => { + const navigation = useNavigation() + const nameAtom = useContext(ScreenNameContext) + const navigationInstance = useContext(NavigationInstanceContext) + const jotaiStore = useStore() + const previousName = useRef(jotaiStore.get(nameAtom)) + useEffect(() => { + return navigation.on("screenChange", (payload) => { + if (!payload.route) return + const Component = payload.route.Component as NavigationControllerView + const state = jotaiStore.get(navigationInstance.__internal_getCtxValue().routesAtom) + if (payload.type === "appear" && state.at(-1)?.id === payload.route.id) { + previousName.current = jotaiStore.get(nameAtom) + jotaiStore.set(nameAtom, Component.title || Component.displayName || Component.name) + } + if (payload.type === "disappear") { + const lastRoute = state.at(-1) + + if (lastRoute && lastRoute.Component) { + previousName.current = jotaiStore.get(nameAtom) + jotaiStore.set( + nameAtom, + lastRoute?.Component.title || + lastRoute?.Component.displayName || + lastRoute?.Component.name, + ) + } else { + jotaiStore.set(nameAtom, previousName.current) + } + } + }) + }, [jotaiStore, nameAtom, navigation, navigationInstance]) + return null +} +const ScreenItemsMapper = () => { + const chainCtxValue = useContext(ChainNavigationContext) + const routes = useAtomValue(chainCtxValue.routesAtom) + + const routeGroups = useMemo(() => { + const groups: Route[][] = [] + let currentGroup: Route[] = [] + + routes.forEach((route, index) => { + // Start a new group if this is the first route or if it's a modal (non-push) + if (index === 0 || route.type !== "push") { + // Save the previous group if it's not empty + if (currentGroup.length > 0) { + groups.push(currentGroup) + } + // Start a new group with this route + currentGroup = [route] + } else { + // Add to the current group if it's a push route + currentGroup.push(route) + } + }) + + // Add the last group if it's not empty + if (currentGroup.length > 0) { + groups.push(currentGroup) + } + + return groups + }, [routes]) + + return ( + + {routeGroups.map((group) => { + const isPushGroup = group.at(0)?.type === "push" + if (!isPushGroup) { + return + } + return + })} + + ) +} + +const MapScreenStackItems: FC<{ + routes: Route[] +}> = memo(({ routes }) => { + return routes.map((route) => { + return ( + + + + ) + }) +}) + +const ModalScreenStackItems: FC<{ + routes: Route[] +}> = memo(({ routes }) => { + const rootModalRoute = routes.at(0) + const modalScreenOptionsCtxValue = useMemo>( + () => atom({}), + [], + ) + + const modalScreenOptions = useAtomValue(modalScreenOptionsCtxValue) + + if (!rootModalRoute) { + return null + } + const isStackModal = rootModalRoute.type !== "formSheet" + + if (isStackModal) { + return ( + + + + + + + {routes.slice(1).map((route) => { + return ( + + + + ) + })} + + + + ) + } + return routes.map((route) => { + return ( + + + + ) + }) +}) + +const ResolveView: FC<{ + comp?: NavigationControllerView + element?: React.ReactElement + props?: unknown +}> = ({ comp: Component, element, props }) => { + if (Component && typeof Component === "function") { + return + } + if (element) { + return element + } + throw new Error("No component or element provided") +} diff --git a/apps/mobile/src/lib/navigation/StackScreenHeaderPortal.tsx b/apps/mobile/src/lib/navigation/StackScreenHeaderPortal.tsx new file mode 100644 index 0000000000..76850e4a7d --- /dev/null +++ b/apps/mobile/src/lib/navigation/StackScreenHeaderPortal.tsx @@ -0,0 +1,19 @@ +import { jotaiStore } from "@follow/utils" +import { useStore } from "jotai" +import type { FC, PropsWithChildren } from "react" +import { useContext, useEffect } from "react" + +import { ScreenItemContext } from "./ScreenItemContext" + +export const StackScreenHeaderPortal: FC = ({ children }) => { + const ctxValue = useContext(ScreenItemContext) + + const store = useStore() + useEffect(() => { + jotaiStore.set(ctxValue.Slot, { + ...store.get(ctxValue.Slot), + header: children, + }) + }, [ctxValue, children, store]) + return null +} diff --git a/apps/mobile/src/lib/navigation/WrappedScreenItem.tsx b/apps/mobile/src/lib/navigation/WrappedScreenItem.tsx new file mode 100644 index 0000000000..e622297503 --- /dev/null +++ b/apps/mobile/src/lib/navigation/WrappedScreenItem.tsx @@ -0,0 +1,209 @@ +import { isUndefined } from "es-toolkit/compat" +import type { PrimitiveAtom } from "jotai" +import { atom, useAtomValue, useSetAtom } from "jotai" +import type { FC, ReactNode } from "react" +import { memo, useContext, useMemo } from "react" +import { StyleSheet, View } from "react-native" +import { useSharedValue } from "react-native-reanimated" +import type { ScreenStackHeaderConfigProps, StackPresentationTypes } from "react-native-screens" +import { + ScreenStackHeaderCenterView, + ScreenStackHeaderLeftView, + ScreenStackHeaderRightView, + ScreenStackItem, +} from "react-native-screens" + +import { useNavigation } from "@/src/lib/navigation/hooks" +import { useColor } from "@/src/theme/colors" + +import { useCombinedLifecycleEvents } from "./__internal/hooks" +import { defaultHeaderConfig } from "./config" +import type { ScreenItemContextType } from "./ScreenItemContext" +import { ScreenItemContext } from "./ScreenItemContext" +import type { ScreenOptionsContextType } from "./ScreenOptionsContext" +import { ScreenOptionsContext } from "./ScreenOptionsContext" +import type { NavigationControllerViewExtraProps } from "./types" + +export const WrappedScreenItem: FC< + { + screenId: string + children: React.ReactNode + stackPresentation?: StackPresentationTypes + + headerConfig?: ScreenStackHeaderConfigProps + screenOptions?: NavigationControllerViewExtraProps + } & ScreenOptionsContextType +> = memo( + ({ + screenId, + children, + stackPresentation, + headerConfig, + screenOptions: screenOptionsProp, + ...rest + }) => { + const navigation = useNavigation() + const reAnimatedScrollY = useSharedValue(0) + const scrollViewHeight = useSharedValue(0) + const scrollViewContentHeight = useSharedValue(0) + const ctxValue = useMemo( + () => ({ + screenId, + isFocusedAtom: atom(false), + isAppearedAtom: atom(false), + isDisappearedAtom: atom(false), + reAnimatedScrollY, + Slot: atom<{ + header: ReactNode + }>({ + header: null, + }), + scrollViewHeight, + scrollViewContentHeight, + }), + [screenId, reAnimatedScrollY, scrollViewHeight, scrollViewContentHeight], + ) + const setIsFocused = useSetAtom(ctxValue.isFocusedAtom) + const setIsAppeared = useSetAtom(ctxValue.isAppearedAtom) + const setIsDisappeared = useSetAtom(ctxValue.isDisappearedAtom) + + const combinedLifecycleEvents = useCombinedLifecycleEvents(ctxValue.screenId, { + onAppear: () => { + setIsFocused(true) + setIsAppeared(true) + setIsDisappeared(false) + }, + onDisappear: () => { + setIsFocused(false) + setIsAppeared(false) + setIsDisappeared(true) + }, + onWillAppear: () => { + setIsFocused(false) + setIsAppeared(true) + setIsDisappeared(false) + }, + onWillDisappear: () => { + setIsFocused(false) + setIsAppeared(false) + setIsDisappeared(true) + }, + }) + + const screenOptionsCtxValue = useMemo>( + () => atom({}), + [], + ) + + const screenOptionsFromCtx = useAtomValue(screenOptionsCtxValue) + + const backgroundColor = useColor("systemBackground") + + // Priority: Ctx > Define on Component + + const mergedScreenOptions = useMemo( + () => ({ + ...screenOptionsProp, + ...resolveScreenOptions(screenOptionsFromCtx), + }), + [screenOptionsFromCtx, screenOptionsProp], + ) + return ( + + + { + navigation.__internal_dismiss(screenId) + }} + {...rest} + {...mergedScreenOptions} + > +
+ {children} + + + + ) + }, +) +const Header = () => { + const ctxValue = useContext(ScreenItemContext) + + const Slot = useAtomValue(ctxValue.Slot) + + if (!Slot.header) { + return null + } + return {Slot.header} +} + +WrappedScreenItem.displayName = "WrappedScreenItem" + +type ExtractFC = T extends FC ? P : never +const resolveScreenOptions = ( + options: ScreenOptionsContextType, +): Partial> => { + const headerConfig = { + ...defaultHeaderConfig, + } + + if (options.nativeHeader) { + headerConfig.hidden = false + headerConfig.translucent = true + headerConfig.blurEffect = "systemChromeMaterial" + headerConfig.backgroundColor = "rgba(255, 255, 255, 0)" + + const headerAeras = [] as ReactNode[] + if (options.headerLeftArea) { + headerAeras[0] = options.headerLeftArea + } + if (options.headerRightArea) { + headerAeras[2] = options.headerRightArea + } + if (options.headerTitleArea) { + headerAeras[1] = options.headerTitleArea + } + + if (headerAeras.length > 0) { + headerConfig.children = ( + <> + {!!headerAeras[0] && ( + {headerAeras[0]} + )} + {!!headerAeras[1] && ( + {headerAeras[1]} + )} + {!!headerAeras[2] && ( + {headerAeras[2]} + )} + + ) + } + } + + const finalConfig: Partial> = { + headerConfig, + } + + if (!isUndefined(options.preventNativeDismiss)) { + finalConfig.preventNativeDismiss = options.preventNativeDismiss + } + + if (!isUndefined(options.gestureEnabled)) { + finalConfig.gestureEnabled = options.gestureEnabled + } + + return finalConfig +} diff --git a/apps/mobile/src/lib/navigation/__internal/hooks.ts b/apps/mobile/src/lib/navigation/__internal/hooks.ts new file mode 100644 index 0000000000..b3f68cc462 --- /dev/null +++ b/apps/mobile/src/lib/navigation/__internal/hooks.ts @@ -0,0 +1,55 @@ +import { useEffect, useMemo, useRef } from "react" + +import { useNavigation } from "../hooks" + +export const useCombinedLifecycleEvents = ( + screenId: string, + { + onAppear, + onDisappear, + onWillAppear, + onWillDisappear, + }: { + onAppear?: () => void + onDisappear?: () => void + onWillAppear?: () => void + onWillDisappear?: () => void + } = {}, +) => { + const navigation = useNavigation() + const stableRef = useRef({ + onAppear, + onDisappear, + onWillAppear, + onWillDisappear, + }) + + useEffect(() => { + stableRef.current = { + onAppear, + onDisappear, + onWillAppear, + onWillDisappear, + } + }, [onAppear, onDisappear, onWillAppear, onWillDisappear]) + return useMemo(() => { + return { + onAppear: () => { + navigation.emit("didAppear", { screenId }) + stableRef.current.onAppear?.() + }, + onDisappear: () => { + navigation.emit("didDisappear", { screenId }) + stableRef.current.onDisappear?.() + }, + onWillAppear: () => { + navigation.emit("willAppear", { screenId }) + stableRef.current.onWillAppear?.() + }, + onWillDisappear: () => { + navigation.emit("willDisappear", { screenId }) + stableRef.current.onWillDisappear?.() + }, + } + }, [navigation, screenId]) +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/BottomTabContext.tsx b/apps/mobile/src/lib/navigation/bottom-tab/BottomTabContext.tsx new file mode 100644 index 0000000000..0c0c74d20b --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/BottomTabContext.tsx @@ -0,0 +1,14 @@ +import type { PrimitiveAtom } from "jotai" +import { createContext } from "react" + +import type { TabScreenProps } from "./TabScreen" + +export interface BottomTabContextType { + currentIndexAtom: PrimitiveAtom + + loadedableIndexAtom: PrimitiveAtom> + + tabScreensAtom: PrimitiveAtom + tabHeightAtom: PrimitiveAtom +} +export const BottomTabContext = createContext(null!) diff --git a/apps/mobile/src/lib/navigation/bottom-tab/CalculateTabBarOpacity.tsx b/apps/mobile/src/lib/navigation/bottom-tab/CalculateTabBarOpacity.tsx new file mode 100644 index 0000000000..7411b68ccb --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/CalculateTabBarOpacity.tsx @@ -0,0 +1,41 @@ +import { useContext } from "react" +import { useAnimatedReaction } from "react-native-reanimated" + +import { BottomTabBarBackgroundContext } from "@/src/components/layouts/tabbar/contexts/BottomTabBarBackgroundContext" +import { useBottomTabBarHeight } from "@/src/components/layouts/tabbar/hooks" + +import { ScreenItemContext } from "../ScreenItemContext" + +// FIXME +export const CalculateTabBarOpacity = () => { + const { scrollViewContentHeight, scrollViewHeight, reAnimatedScrollY } = + useContext(ScreenItemContext) + const { opacity } = useContext(BottomTabBarBackgroundContext) + const tabbarHeight = useBottomTabBarHeight() + useAnimatedReaction( + () => { + // Calculate how close we are to the bottom of the content + const distanceFromBottom = + scrollViewContentHeight.value - + scrollViewHeight.value - + reAnimatedScrollY.value - + tabbarHeight + + // Define a threshold for when to start fading (in pixels) + const fadeThreshold = 50 + + // If we're within the threshold distance from the bottom, calculate opacity + if (distanceFromBottom <= fadeThreshold) { + // Linear interpolation: 0 at bottom, 1 at threshold + return Math.max(0, distanceFromBottom / fadeThreshold) + } + + // Otherwise, keep the tab bar fully visible + return 1 + }, + (opacityValue) => { + opacity.value = opacityValue + }, + ) + return null +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/TabBarPortal.ios.tsx b/apps/mobile/src/lib/navigation/bottom-tab/TabBarPortal.ios.tsx new file mode 100644 index 0000000000..4fd6b2b3a3 --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/TabBarPortal.ios.tsx @@ -0,0 +1,34 @@ +import { requireNativeView } from "expo" +import { useSetAtom } from "jotai" +import { useContext } from "react" +import type { ViewProps } from "react-native" +import { StyleSheet, View } from "react-native" + +import { BottomTabContext } from "./BottomTabContext" + +const TabBarPortalNative = requireNativeView("TabBarPortal") + +export const TabBarPortal = ({ children }: { children: React.ReactNode }) => { + const { tabHeightAtom } = useContext(BottomTabContext) + const setTabHeight = useSetAtom(tabHeightAtom) + return ( + + { + setTabHeight(e.nativeEvent.layout.height) + }} + > + {children} + + + ) +} + +const styles = StyleSheet.create({ + container: { + position: "absolute", + bottom: 0, + left: 0, + right: 0, + }, +}) diff --git a/apps/mobile/src/lib/navigation/bottom-tab/TabBarPortal.tsx b/apps/mobile/src/lib/navigation/bottom-tab/TabBarPortal.tsx new file mode 100644 index 0000000000..8e48f49114 --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/TabBarPortal.tsx @@ -0,0 +1,30 @@ +import { useSetAtom } from "jotai" +import { useContext } from "react" +import { StyleSheet, View } from "react-native" + +import { BottomTabContext } from "./BottomTabContext" + +export const TabBarPortal = ({ children }: { children: React.ReactNode }) => { + const { tabHeightAtom } = useContext(BottomTabContext) + const setTabHeight = useSetAtom(tabHeightAtom) + return ( + + { + setTabHeight(e.nativeEvent.layout.height) + }} + > + {children} + + + ) +} + +const styles = StyleSheet.create({ + container: { + position: "absolute", + bottom: 0, + left: 0, + right: 0, + }, +}) diff --git a/apps/mobile/src/lib/navigation/bottom-tab/TabRoot.ios.tsx b/apps/mobile/src/lib/navigation/bottom-tab/TabRoot.ios.tsx new file mode 100644 index 0000000000..83bd59287a --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/TabRoot.ios.tsx @@ -0,0 +1,69 @@ +import { requireNativeView } from "expo" +import { atom, useAtom } from "jotai" +import type { FC, PropsWithChildren } from "react" +import * as React from "react" +import { useCallback, useMemo, useState } from "react" +import type { NativeSyntheticEvent, ViewProps } from "react-native" +import { StyleSheet } from "react-native" + +import type { BottomTabContextType } from "./BottomTabContext" +import { BottomTabContext } from "./BottomTabContext" +import type { TabScreenProps } from "./TabScreen.ios" +import { TabScreen } from "./TabScreen.ios" + +interface TabRootProps { + initialTabIndex?: number +} + +const TabBarRoot = requireNativeView< + { + onTabIndexChange: (e: NativeSyntheticEvent<{ index: number }>) => void + selectedIndex: number + } & ViewProps +>("TabBarRoot") + +export const TabRoot: FC = ({ + children, + initialTabIndex = 0, +}) => { + const [tabIndexAtom] = useState(() => atom(initialTabIndex)) + const [tabIndex, setTabIndex] = useAtom(tabIndexAtom) + + const ctxValue = useMemo( + () => ({ + currentIndexAtom: tabIndexAtom, + loadedableIndexAtom: atom(new Set()), + tabScreensAtom: atom([]), + tabHeightAtom: atom(0), + }), + [tabIndexAtom], + ) + + const MapChildren = useMemo(() => { + let cnt = 0 + return React.Children.map(children, (child) => { + if (typeof child === "object" && child && "type" in child && child.type === TabScreen) { + return React.cloneElement(child, { + tabScreenIndex: cnt++, + }) + } + return child + }) + }, [children]) + return ( + + { + setTabIndex(e.nativeEvent.index) + }, + [setTabIndex], + )} + selectedIndex={tabIndex} + > + {MapChildren} + + + ) +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/TabRoot.tsx b/apps/mobile/src/lib/navigation/bottom-tab/TabRoot.tsx new file mode 100644 index 0000000000..96bc89b5c1 --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/TabRoot.tsx @@ -0,0 +1,48 @@ +import { atom } from "jotai" +import type { FC, PropsWithChildren } from "react" +import * as React from "react" +import { useMemo, useState } from "react" +import { StyleSheet, View } from "react-native" + +import type { BottomTabContextType } from "./BottomTabContext" +import { BottomTabContext } from "./BottomTabContext" +import type { TabScreenProps } from "./TabScreen" +import { TabScreen } from "./TabScreen" + +interface TabRootProps { + initialTabIndex?: number +} + +export const TabRoot: FC = ({ + children, + initialTabIndex = 0, +}) => { + const [tabIndexAtom] = useState(() => atom(initialTabIndex)) + + const ctxValue = useMemo( + () => ({ + currentIndexAtom: tabIndexAtom, + loadedableIndexAtom: atom(new Set()), + tabScreensAtom: atom([]), + tabHeightAtom: atom(0), + }), + [tabIndexAtom], + ) + + const MapChildren = useMemo(() => { + let cnt = 0 + return React.Children.map(children, (child) => { + if (typeof child === "object" && child && "type" in child && child.type === TabScreen) { + return React.cloneElement(child, { + tabScreenIndex: cnt++, + }) + } + return child + }) + }, [children]) + return ( + + {MapChildren} + + ) +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/TabScreen.ios.tsx b/apps/mobile/src/lib/navigation/bottom-tab/TabScreen.ios.tsx new file mode 100644 index 0000000000..532ba8a46a --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/TabScreen.ios.tsx @@ -0,0 +1,115 @@ +import { requireNativeView } from "expo" +import { atom, useAtom, useAtomValue, useSetAtom } from "jotai" +import type { FC, PropsWithChildren } from "react" +import { useContext, useEffect, useMemo } from "react" +import type { ViewProps } from "react-native" +import { StyleSheet } from "react-native" + +import { WrappedScreenItem } from "../WrappedScreenItem" +import { BottomTabContext } from "./BottomTabContext" +import { LifecycleEvents, ScreenNameRegister } from "./shared" +import type { TabScreenContextType } from "./TabScreenContext" +import { TabScreenContext } from "./TabScreenContext" +import type { TabbarIconProps, TabScreenComponent } from "./types" + +const TabScreenNative = requireNativeView("TabScreen") + +export interface TabScreenProps { + title: string + tabScreenIndex: number + renderIcon?: (props: TabbarIconProps) => React.ReactNode + lazy?: boolean +} +export const TabScreen: FC>> = ({ + children, + ...props +}) => { + const { tabScreenIndex } = props as any as TabScreenProps + + const { + loadedableIndexAtom, + currentIndexAtom, + tabScreensAtom: tabScreens, + } = useContext(BottomTabContext) + + const setTabScreens = useSetAtom(tabScreens) + + const mergedProps = useMemo(() => { + const propsFromChildren: Partial = {} + if (children && typeof children === "object") { + const childType = (children as any).type as TabScreenComponent + if ("tabBarIcon" in childType) { + propsFromChildren.renderIcon = childType.tabBarIcon + } + if ("title" in childType) { + propsFromChildren.title = childType.title + } + if ("lazy" in childType) { + propsFromChildren.lazy = childType.lazy + } + } + return { + ...propsFromChildren, + ...props, + } + }, [children, props]) + useEffect(() => { + setTabScreens((prev) => [ + ...prev, + { + ...mergedProps, + tabScreenIndex, + }, + ]) + + return () => { + setTabScreens((prev) => + prev.filter((tabScreen) => tabScreen.tabScreenIndex !== tabScreenIndex), + ) + } + }, [setTabScreens, props, tabScreenIndex, children, mergedProps]) + + const currentSelectedIndex = useAtomValue(currentIndexAtom) + + const isSelected = useMemo( + () => currentSelectedIndex === tabScreenIndex, + [currentSelectedIndex, tabScreenIndex], + ) + + const [loadedableIndexSet, setLoadedableIndex] = useAtom(loadedableIndexAtom) + + const isLoadedBefore = loadedableIndexSet.has(tabScreenIndex) + useEffect(() => { + if (isSelected) { + setLoadedableIndex((prev) => { + prev.add(tabScreenIndex) + return new Set(prev) + }) + } + }, [setLoadedableIndex, tabScreenIndex, isSelected]) + + const ctxValue = useMemo( + () => ({ + tabScreenIndex, + + titleAtom: atom(props.title), + }), + [tabScreenIndex, props.title], + ) + const shouldLoadReact = mergedProps.lazy ? isSelected || isLoadedBefore : true + + return ( + + + {shouldLoadReact && ( + + {children} + + + {/* */} + + )} + + + ) +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/TabScreen.tsx b/apps/mobile/src/lib/navigation/bottom-tab/TabScreen.tsx new file mode 100644 index 0000000000..c7e83b1b1f --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/TabScreen.tsx @@ -0,0 +1,102 @@ +import { atom, useAtom, useAtomValue, useSetAtom } from "jotai" +import type { FC, PropsWithChildren } from "react" +import { useContext, useEffect, useMemo } from "react" +import { StyleSheet, View } from "react-native" + +import { WrappedScreenItem } from "../WrappedScreenItem" +import { BottomTabContext } from "./BottomTabContext" +import { LifecycleEvents, ScreenNameRegister } from "./shared" +import type { TabScreenContextType } from "./TabScreenContext" +import { TabScreenContext } from "./TabScreenContext" +import type { TabbarIconProps, TabScreenComponent } from "./types" + +export interface TabScreenProps { + title: string + tabScreenIndex: number + renderIcon?: (props: TabbarIconProps) => React.ReactNode +} +export const TabScreen: FC>> = ({ + children, + ...props +}) => { + const { tabScreenIndex } = props as any as TabScreenProps + + const { + loadedableIndexAtom, + currentIndexAtom, + tabScreensAtom: tabScreens, + } = useContext(BottomTabContext) + + const setTabScreens = useSetAtom(tabScreens) + useEffect(() => { + const propsFromChildren: Partial = {} + if (children && typeof children === "object") { + const childType = (children as any).type as TabScreenComponent + if ("tabBarIcon" in childType) { + propsFromChildren.renderIcon = childType.tabBarIcon + } + if ("title" in childType) { + propsFromChildren.title = childType.title + } + } + + setTabScreens((prev) => [ + ...prev, + { + ...propsFromChildren, + ...props, + tabScreenIndex, + }, + ]) + + return () => { + setTabScreens((prev) => + prev.filter((tabScreen) => tabScreen.tabScreenIndex !== tabScreenIndex), + ) + } + }, [setTabScreens, props, tabScreenIndex, children]) + + const currentSelectedIndex = useAtomValue(currentIndexAtom) + + const isSelected = useMemo( + () => currentSelectedIndex === tabScreenIndex, + [currentSelectedIndex, tabScreenIndex], + ) + + const [loadedableIndexSet, setLoadedableIndex] = useAtom(loadedableIndexAtom) + + const isLoadedBefore = loadedableIndexSet.has(tabScreenIndex) + useEffect(() => { + if (isSelected) { + setLoadedableIndex((prev) => { + prev.add(tabScreenIndex) + return new Set(prev) + }) + } + }, [setLoadedableIndex, tabScreenIndex, isSelected]) + + const ctxValue = useMemo( + () => ({ + tabScreenIndex, + + titleAtom: atom(props.title), + }), + [tabScreenIndex, props.title], + ) + const shouldLoadReact = isSelected || isLoadedBefore + + return ( + + + {shouldLoadReact && ( + + {children} + + + {/* */} + + )} + + + ) +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/TabScreenContext.tsx b/apps/mobile/src/lib/navigation/bottom-tab/TabScreenContext.tsx new file mode 100644 index 0000000000..6f0f9089a3 --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/TabScreenContext.tsx @@ -0,0 +1,9 @@ +import type { PrimitiveAtom } from "jotai" +import { createContext } from "react" + +export interface TabScreenContextType { + tabScreenIndex: number + + titleAtom: PrimitiveAtom +} +export const TabScreenContext = createContext(null!) diff --git a/apps/mobile/src/lib/navigation/bottom-tab/hooks.ts b/apps/mobile/src/lib/navigation/bottom-tab/hooks.ts new file mode 100644 index 0000000000..cbe0e16866 --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/hooks.ts @@ -0,0 +1,38 @@ +import { useAtomValue, useSetAtom } from "jotai" +import { useCallback, useContext } from "react" + +import { ScreenItemContext } from "../ScreenItemContext" +import { BottomTabContext } from "./BottomTabContext" +import { TabScreenContext } from "./TabScreenContext" + +export const useScreenIsAppeared = () => { + const { isAppearedAtom } = useContext(ScreenItemContext) + + return useAtomValue(isAppearedAtom) +} + +export const useTabScreenIsFocused = () => { + const { currentIndexAtom } = useContext(BottomTabContext) + const currentIndex = useAtomValue(currentIndexAtom) + const { isFocusedAtom } = useContext(ScreenItemContext) + const isFocused = useAtomValue(isFocusedAtom) + const { tabScreenIndex } = useContext(TabScreenContext) + + return currentIndex === tabScreenIndex && isFocused +} + +export const useSwitchTab = () => { + const { currentIndexAtom } = useContext(BottomTabContext) + const setCurrentIndex = useSetAtom(currentIndexAtom) + return useCallback( + (index: number) => { + setCurrentIndex(index) + }, + [setCurrentIndex], + ) +} + +export const useBottomTabHeight = () => { + const { tabHeightAtom } = useContext(BottomTabContext) + return useAtomValue(tabHeightAtom) +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/shared.tsx b/apps/mobile/src/lib/navigation/bottom-tab/shared.tsx new file mode 100644 index 0000000000..16522cd2d4 --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/shared.tsx @@ -0,0 +1,40 @@ +import { useAtomValue, useSetAtom, useStore } from "jotai" +import { useContext, useEffect } from "react" + +import { ScreenItemContext } from "../ScreenItemContext" +import { ScreenNameContext } from "../ScreenNameContext" +import { useTabScreenIsFocused } from "./hooks" +import { TabScreenContext } from "./TabScreenContext" + +export const ScreenNameRegister = () => { + const nameAtom = useContext(ScreenNameContext) + const { titleAtom } = useContext(TabScreenContext) + const isFocused = useTabScreenIsFocused() + const title = useAtomValue(titleAtom) + const store = useStore() + useEffect(() => { + if (isFocused) { + store.set(nameAtom, title) + } + }, [isFocused, title, nameAtom, store]) + return null +} + +export const LifecycleEvents = ({ isSelected }: { isSelected: boolean }) => { + const { isFocusedAtom, isAppearedAtom, isDisappearedAtom } = useContext(ScreenItemContext) + const setIsFocused = useSetAtom(isFocusedAtom) + const setIsAppeared = useSetAtom(isAppearedAtom) + const setIsDisappeared = useSetAtom(isDisappearedAtom) + useEffect(() => { + if (isSelected) { + setIsFocused(true) + setIsAppeared(true) + setIsDisappeared(false) + } else { + setIsFocused(false) + setIsAppeared(false) + setIsDisappeared(true) + } + }, [isSelected, setIsAppeared, setIsDisappeared, setIsFocused]) + return null +} diff --git a/apps/mobile/src/lib/navigation/bottom-tab/types.ts b/apps/mobile/src/lib/navigation/bottom-tab/types.ts new file mode 100644 index 0000000000..b657c9cba7 --- /dev/null +++ b/apps/mobile/src/lib/navigation/bottom-tab/types.ts @@ -0,0 +1,13 @@ +import type { FC } from "react" + +export type TabbarIconProps = { + focused: boolean + size: number + color: string +} +export type TabScreenComponent = FC & { + tabBarIcon?: (props: TabbarIconProps) => React.ReactNode + title?: string + + lazy?: boolean +} diff --git a/apps/mobile/src/lib/navigation/config.ts b/apps/mobile/src/lib/navigation/config.ts new file mode 100644 index 0000000000..866a04d6ad --- /dev/null +++ b/apps/mobile/src/lib/navigation/config.ts @@ -0,0 +1,5 @@ +import type { ScreenStackHeaderConfigProps } from "react-native-screens" + +export const defaultHeaderConfig: ScreenStackHeaderConfigProps = { + hidden: true, +} diff --git a/apps/mobile/src/lib/navigation/debug/DebugButtonGroup.tsx b/apps/mobile/src/lib/navigation/debug/DebugButtonGroup.tsx new file mode 100644 index 0000000000..bb31a60724 --- /dev/null +++ b/apps/mobile/src/lib/navigation/debug/DebugButtonGroup.tsx @@ -0,0 +1,159 @@ +/* eslint-disable no-console */ +import { useEffect, useRef } from "react" +import { Button, SafeAreaView, ScrollView, Text, TouchableOpacity, View } from "react-native" + +import { FullWindowOverlay } from "@/src/components/common/FullWindowOverlay" +import { CloseCuteReIcon } from "@/src/icons/close_cute_re" + +import { useNavigation } from "../hooks" +import { Navigation } from "../Navigation" +import type { NavigationControllerView } from "../types" + +export const DebugButtonGroup = () => { + useEffect(() => { + const disposers: (() => void)[] = [] + disposers.push( + Navigation.rootNavigation.on("willAppear", (payload) => { + console.log("willAppear", payload) + }), + Navigation.rootNavigation.on("didAppear", (payload) => { + console.log("didAppear", payload) + }), + Navigation.rootNavigation.on("willDisappear", (payload) => { + console.log("willDisappear", payload) + }), + Navigation.rootNavigation.on("didDisappear", (payload) => { + console.log("didDisappear", payload) + }), + ) + return () => { + disposers.forEach((disposer) => disposer()) + } + }, []) + + const cntRef = useRef(0) + return ( + + + + Ad eveniet laboriosam hic voluptas non facilis sint. Laborum rem et provident blanditiis + iure rem. Porro voluptate ipsa explicabo voluptatem cumque est architecto. Sit + voluptatibus exercitationem recusandae cupiditate tenetur inventore amet repellendus + ratione. Nobis nulla harum soluta aliquam iure unde saepe. Modi ipsam harum aspernatur + aperiam quod pariatur nisi corporis. Doloribus molestiae a dolore. Veniam commodi nesciunt + beatae itaque aliquid nemo. Ut labore rem voluptates. Reprehenderit recusandae voluptate + earum consectetur tempora corrupti. Nulla ducimus enim sit ipsam eum esse debitis saepe. + Nobis ut voluptas. Id sapiente voluptate soluta ipsa esse corrupti facere nemo recusandae. + Dignissimos eum mollitia hic corrupti. Reiciendis voluptates et provident sed laborum + consequuntur. Quod nemo nesciunt dignissimos doloribus veniam odio. + + + + + + + + ) +} + +const TestScreen3: NavigationControllerView = () => { + const navigation = useNavigation() + return ( + + { + navigation.back() + }} + > + + + + TestScreen3 + Hello2 + Hello2 + Hello2 + Hello2 + Hello2 + Hello2 + Hello2 + Hello2 + Hello2 + + ) +} +TestScreen3.sheetAllowedDetents = [0.7, 1] +TestScreen3.sheetCornerRadius = 0 + +const TestScreen: NavigationControllerView = () => { + const navigation = useNavigation() + return ( + + { + navigation.back() + }} + > + + + + {Array.from({ length: 100 }).map((_, index) => { + return ( + + TestScreen + + ) + })} + + + ) +} + +TestScreen.sheetAllowedDetents = [0.5, 1] diff --git a/apps/mobile/src/lib/navigation/hooks.ts b/apps/mobile/src/lib/navigation/hooks.ts new file mode 100644 index 0000000000..96bb533c62 --- /dev/null +++ b/apps/mobile/src/lib/navigation/hooks.ts @@ -0,0 +1,74 @@ +import { useContext } from "react" +import type { StackPresentationTypes } from "react-native-screens" + +import { GroupedNavigationRouteContext } from "./GroupedNavigationRouteContext" +import { NavigationInstanceContext } from "./NavigationInstanceContext" +import { ScreenItemContext } from "./ScreenItemContext" + +export const useCanBack = () => { + const { screenId } = useContext(ScreenItemContext) + + const routeGroups = useContext(GroupedNavigationRouteContext) + if (!routeGroups) return false + + const routeGroup = routeGroups.find((group) => group.some((r) => r.id === screenId)) + if (!routeGroup) return false + + if (routeGroup.length === 0) return false + // If routeGroup is M, P, P and current route is P, then we can back + + const firstIsModal = routeGroup.at(0)?.type !== "push" + const onlyOne = routeGroup.length === 1 + if (firstIsModal && onlyOne) return false + return true +} + +/** + * If screen present as a modal, then we can dismiss it. + */ +export const useCanDismiss = () => { + const { screenId } = useContext(ScreenItemContext) + + const routeGroups = useContext(GroupedNavigationRouteContext) + if (!routeGroups) return false + + const routeGroup = routeGroups.find((group) => group.some((r) => r.id === screenId)) + if (!routeGroup || routeGroup.length === 0) return false + + return routeGroup.at(0)?.type !== "push" +} + +export const useNavigation = () => { + const navigation = useContext(NavigationInstanceContext) + if (!navigation) { + throw new Error("Navigation not found") + } + return navigation +} + +export const useScreenIsInModal = useCanDismiss + +const sheetTypes = new Set(["formSheet", "modal"]) +export const useScreenIsInSheetModal = () => { + const { screenId } = useContext(ScreenItemContext) + + const routeGroups = useContext(GroupedNavigationRouteContext) + if (!routeGroups) return false + + const routeGroup = routeGroups.find((group) => group.some((r) => r.id === screenId)) + if (!routeGroup || routeGroup.length === 0) return false + const first = routeGroup.at(0) + if (!first) return false + return sheetTypes.has(first.type) +} + +export const useIsSingleRouteInGroup = () => { + const { screenId } = useContext(ScreenItemContext) + + const routeGroups = useContext(GroupedNavigationRouteContext) + if (!routeGroups) return false + + const routeGroup = routeGroups.find((group) => group.some((r) => r.id === screenId)) + if (!routeGroup || routeGroup.length === 0) return false + return routeGroup.length === 1 +} diff --git a/apps/mobile/src/lib/navigation/sitemap/registry.ts b/apps/mobile/src/lib/navigation/sitemap/registry.ts new file mode 100644 index 0000000000..f7a8f275bf --- /dev/null +++ b/apps/mobile/src/lib/navigation/sitemap/registry.ts @@ -0,0 +1,41 @@ +import type { NavigationControllerView, NavigationControllerViewType } from "../types" + +type RegisterOptions = { + stackPresentation: NavigationControllerViewType +} +type Registry = RegisterOptions & { + Component: NavigationControllerView + props: any +} + +class NavigationSitemapRegistryStatic { + private map = new Map() + registerByComponent( + controllerView: NavigationControllerView, + props?: T, + options?: Partial, + ) { + const title = controllerView.name || controllerView.displayName + if (!title) { + if (__DEV__) { + console.error("registerByComponent: no name, ignore") + } + return + } + this.map.set(title, { + Component: controllerView, + props, + stackPresentation: "push", + ...options, + }) + } + + [Symbol.iterator]() { + return this.map.entries() + } + entries() { + return [...this.map.entries()] + } +} + +export const NavigationSitemapRegistry = new NavigationSitemapRegistryStatic() diff --git a/apps/mobile/src/lib/navigation/types.ts b/apps/mobile/src/lib/navigation/types.ts new file mode 100644 index 0000000000..009771f9eb --- /dev/null +++ b/apps/mobile/src/lib/navigation/types.ts @@ -0,0 +1,36 @@ +import type { FC } from "react" +import type { ScreenProps, StackPresentationTypes } from "react-native-screens" + +export interface NavigationPushOptions { + Component?: NavigationControllerView + element?: React.ReactElement +} +export type NavigationControllerViewExtraProps = { + /** + * Unique identifier for the view. + */ + id?: string + + /** + * Title for the view. + */ + title?: string + + /** + * Whether the view is transparent. + */ + transparent?: boolean +} & Pick< + ScreenProps, + | "sheetAllowedDetents" + | "sheetCornerRadius" + | "sheetExpandsWhenScrolledToEdge" + | "sheetElevation" + | "sheetGrabberVisible" + | "sheetInitialDetentIndex" + | "sheetLargestUndimmedDetentIndex" +> + +// eslint-disable-next-line @typescript-eslint/no-empty-object-type +export type NavigationControllerView

= FC

& NavigationControllerViewExtraProps +export type NavigationControllerViewType = StackPresentationTypes diff --git a/apps/mobile/src/main.tsx b/apps/mobile/src/main.tsx index 96119e9ab6..7ebd69c0f1 100644 --- a/apps/mobile/src/main.tsx +++ b/apps/mobile/src/main.tsx @@ -1,14 +1,87 @@ +import "./global.css" + import { registerRootComponent } from "expo" import { Image } from "expo-image" -import { App } from "expo-router/build/qualified-entry" import { cssInterop } from "nativewind" import { enableFreeze } from "react-native-screens" +import { Analytics } from "./Analytics" +import { App } from "./App" +import { BottomTabProvider } from "./components/layouts/tabbar/BottomTabProvider" +import { BottomTabs } from "./components/layouts/tabbar/BottomTabs" import { initializeApp } from "./initialize" +import { TabBarPortal } from "./lib/navigation/bottom-tab/TabBarPortal" +import { TabRoot } from "./lib/navigation/bottom-tab/TabRoot" +import { TabScreen } from "./lib/navigation/bottom-tab/TabScreen" +import { NavigationSitemapRegistry } from "./lib/navigation/sitemap/registry" +import { RootStackNavigation } from "./lib/navigation/StackNavigation" +import { RootProviders } from "./providers" +import { TermsScreen } from "./screens/(headless)/terms" +import { TwoFactorAuthScreen } from "./screens/(modal)/2fa" +import { ForgetPasswordScreen } from "./screens/(modal)/forget-password" +import { LoginScreen } from "./screens/(modal)/login" +import { SignUpScreen } from "./screens/(modal)/sign-up" +import { IndexTabScreen } from "./screens/(stack)/(tabs)" +import { DiscoverTabScreen } from "./screens/(stack)/(tabs)/discover" +import { SettingsTabScreen } from "./screens/(stack)/(tabs)/settings" +import { SubscriptionsTabScreen } from "./screens/(stack)/(tabs)/subscriptions" +import { OnboardingScreen } from "./screens/onboarding" enableFreeze(true) cssInterop(Image, { className: "style" }) initializeApp() -registerRootComponent(App) +registerRootComponent(() => ) + +const Entry = () => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) +} + +;[TermsScreen].forEach((Component) => { + NavigationSitemapRegistry.registerByComponent(Component) +}) +;[LoginScreen, SignUpScreen, ForgetPasswordScreen, TwoFactorAuthScreen].forEach((Component) => { + NavigationSitemapRegistry.registerByComponent(Component, void 0, { + stackPresentation: "modal", + }) +}) +;[OnboardingScreen].forEach((Component) => { + NavigationSitemapRegistry.registerByComponent(Component, void 0, { + stackPresentation: "transparentModal", + }) +}) diff --git a/apps/mobile/src/modules/context-menu/entry.tsx b/apps/mobile/src/modules/context-menu/entry.tsx index 6fe3adda19..39ad9c5170 100644 --- a/apps/mobile/src/modules/context-menu/entry.tsx +++ b/apps/mobile/src/modules/context-menu/entry.tsx @@ -1,4 +1,4 @@ -import { router } from "expo-router" +import { PortalProvider } from "@gorhom/portal" import type { PropsWithChildren } from "react" import { useCallback } from "react" import { Share, Text, View } from "react-native" @@ -8,10 +8,11 @@ import { preloadWebViewEntry, } from "@/src/components/native/webview/EntryContentWebView" import { ContextMenu } from "@/src/components/ui/context-menu" -import { PortalHost } from "@/src/components/ui/portal" import { openLink } from "@/src/lib/native" +import { useNavigation } from "@/src/lib/navigation/hooks" import { toast } from "@/src/lib/toast" -import { useSelectedView } from "@/src/modules/screen/atoms" +import { getHorizontalScrolling, useSelectedView } from "@/src/modules/screen/atoms" +import { EntryDetailScreen } from "@/src/screens/(stack)/entries/[entryId]" import { useIsEntryStarred } from "@/src/store/collection/hooks" import { collectionSyncService } from "@/src/store/collection/store" import { useEntry } from "@/src/store/entry/hooks" @@ -23,11 +24,17 @@ export const EntryItemContextMenu = ({ id, children }: PropsWithChildren<{ id: s const view = useSelectedView() const isEntryStarred = useIsEntryStarred(id) + const navigation = useNavigation() const handlePressPreview = useCallback(() => { - if (!entry) return - preloadWebViewEntry(entry) - router.push(`/entries/${id}`) - }, [entry, id]) + const isHorizontalScrolling = getHorizontalScrolling() + if (entry && !isHorizontalScrolling) { + preloadWebViewEntry(entry) + navigation.pushControllerView(EntryDetailScreen, { + entryId: id, + view: view!, + }) + } + }, [entry, id, navigation, view]) if (!entry) return null @@ -38,14 +45,14 @@ export const EntryItemContextMenu = ({ id, children }: PropsWithChildren<{ id: s {() => ( - + {entry.title?.trim()} - + )} diff --git a/apps/mobile/src/modules/context-menu/feeds.tsx b/apps/mobile/src/modules/context-menu/feeds.tsx index 1a51f96c0e..6efe0a8612 100644 --- a/apps/mobile/src/modules/context-menu/feeds.tsx +++ b/apps/mobile/src/modules/context-menu/feeds.tsx @@ -1,5 +1,4 @@ import { FeedViewType } from "@follow/constants" -import { router } from "expo-router" import type { FC, PropsWithChildren } from "react" import { useCallback, useMemo } from "react" import type { ListRenderItemInfo } from "react-native" @@ -7,7 +6,9 @@ import { Alert, Clipboard, FlatList, View } from "react-native" import { ContextMenu } from "@/src/components/ui/context-menu" import { views } from "@/src/constants/views" +import { useNavigation } from "@/src/lib/navigation/hooks" import { toast } from "@/src/lib/toast" +import { FeedScreen } from "@/src/screens/(stack)/feeds/[feedId]" import { useEntryIdsByFeedId } from "@/src/store/entry/hooks" import { getFeed } from "@/src/store/feed/getter" import { getSubscription } from "@/src/store/subscription/getter" @@ -25,7 +26,7 @@ export const SubscriptionFeedItemContextMenu: FC< } > = ({ id, children, view }) => { const allCategories = useSubscriptionCategory(view) - + const navigation = useNavigation() return ( {children} @@ -35,7 +36,9 @@ export const SubscriptionFeedItemContextMenu: FC< { - router.push(`/feeds/${id}`) + navigation.pushControllerView(FeedScreen, { + feedId: id, + }) }} > {() => } diff --git a/apps/mobile/src/modules/debug/index.tsx b/apps/mobile/src/modules/debug/index.tsx index 4abd169fcc..67dba8c1a7 100644 --- a/apps/mobile/src/modules/debug/index.tsx +++ b/apps/mobile/src/modules/debug/index.tsx @@ -1,4 +1,3 @@ -import { router } from "expo-router" import { useAtom } from "jotai" import { atomWithStorage } from "jotai/utils" import { useMemo } from "react" @@ -10,7 +9,9 @@ import { useSafeAreaInsets } from "react-native-safe-area-context" import { ReAnimatedTouchableOpacity } from "@/src/components/common/AnimatedComponents" import { BugCuteReIcon } from "@/src/icons/bug_cute_re" import { JotaiPersistSyncStorage } from "@/src/lib/jotai" +import { Navigation } from "@/src/lib/navigation/Navigation" import { useEnvProfile } from "@/src/lib/proxy-env" +import { DebugScreen } from "@/src/screens/(headless)/debug" export const DebugButton = () => { const cachedPositionAtom = useMemo( @@ -40,7 +41,8 @@ export const DebugButton = () => { }) .onEnd((event) => { if (Math.abs(event.translationX) < 5 && Math.abs(event.translationY) < 5) { - runOnJS(router.push)("/debug") + // @ts-expect-error + runOnJS(Navigation.rootNavigation.pushControllerView)(DebugScreen) return } @@ -66,7 +68,7 @@ export const DebugButton = () => { { - runOnJS(router.push)("/debug") + Navigation.rootNavigation.pushControllerView(DebugScreen) }} style={[ { diff --git a/apps/mobile/src/modules/dialogs/AddFeedDialog.tsx b/apps/mobile/src/modules/dialogs/AddFeedDialog.tsx index 8cec02fb91..a708e53bd9 100644 --- a/apps/mobile/src/modules/dialogs/AddFeedDialog.tsx +++ b/apps/mobile/src/modules/dialogs/AddFeedDialog.tsx @@ -1,10 +1,12 @@ -import { router } from "expo-router" import { Text, TextInput, View } from "react-native" import { useColor } from "react-native-uikit-colors" import { LinkCuteReIcon } from "@/src/icons/link_cute_re" import type { DialogComponent } from "@/src/lib/dialog" import { Dialog } from "@/src/lib/dialog" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { Navigation } from "@/src/lib/navigation/Navigation" +import { FollowScreen } from "@/src/screens/(modal)/follow" import { accentColor } from "@/src/theme/colors" export const AddFeedDialog: DialogComponent<{ @@ -12,17 +14,15 @@ export const AddFeedDialog: DialogComponent<{ }> = ({ ctx }) => { const label = useColor("label") + const navigation = useNavigation() const { dismiss } = Dialog.useDialogContext()! const handleAdd = () => { dismiss() const value = ctx.url if (!value) return - router.push({ - pathname: "/follow", - params: { - url: value, - type: "url", - }, + navigation.pushControllerView(FollowScreen, { + url: value, + type: "url", }) } @@ -56,12 +56,9 @@ AddFeedDialog.onConfirm = (ctx) => { ctx.dismiss() setTimeout(() => { - router.push({ - pathname: "/follow", - params: { - url: value, - type: "url", - }, + Navigation.rootNavigation.pushControllerView(FollowScreen, { + url: value, + type: "url", }) }, 16) } diff --git a/apps/mobile/src/modules/discover/RecommendationListItem.tsx b/apps/mobile/src/modules/discover/RecommendationListItem.tsx index 114a4c975a..f9c78939fa 100644 --- a/apps/mobile/src/modules/discover/RecommendationListItem.tsx +++ b/apps/mobile/src/modules/discover/RecommendationListItem.tsx @@ -1,6 +1,5 @@ import type { RSSHubCategories } from "@follow/constants" import type { RSSHubRouteDeclaration } from "@follow/models/src/rsshub" -import { router } from "expo-router" import type { FC } from "react" import { memo, useMemo } from "react" import { Clipboard, Text, TouchableOpacity, View } from "react-native" @@ -10,7 +9,9 @@ import * as ContextMenu from "zeego/context-menu" import { Grid } from "@/src/components/ui/grid" import { FeedIcon } from "@/src/components/ui/icon/feed-icon" import { openLink } from "@/src/lib/native" +import { useNavigation } from "@/src/lib/navigation/hooks" import { toast } from "@/src/lib/toast" +import { RsshubFormScreen } from "@/src/screens/(modal)/rsshub-form" import { RSSHubCategoryCopyMap } from "./copy" @@ -37,6 +38,8 @@ export const RecommendationListItem: FC<{ } }, [data]) + const navigation = useNavigation() + return ( @@ -114,13 +117,10 @@ export const RecommendationListItem: FC<{ { - router.push({ - pathname: "/rsshub-form", - params: { - routePrefix, - route: JSON.stringify(data.routes[route]), - name: data.name, - }, + navigation.presentControllerView(RsshubFormScreen, { + routePrefix, + route: data.routes[route]!, + name: data.name, }) }} className="bg-gray-6 h-10 flex-row items-center justify-center overflow-hidden rounded-xl px-2" diff --git a/apps/mobile/src/modules/discover/Recommendations.tsx b/apps/mobile/src/modules/discover/Recommendations.tsx index 0c0732a9fd..820ad12abb 100644 --- a/apps/mobile/src/modules/discover/Recommendations.tsx +++ b/apps/mobile/src/modules/discover/Recommendations.tsx @@ -17,7 +17,6 @@ import { } from "react-native" import type { PanGestureHandlerGestureEvent } from "react-native-gesture-handler" import { PanGestureHandler } from "react-native-gesture-handler" -import { useSafeAreaInsets } from "react-native-safe-area-context" import { AnimatedScrollView } from "@/src/components/common/AnimatedComponents" import { @@ -192,8 +191,6 @@ const Tab: TabComponent = ({ tab, isSelected, ...rest }) => { const { headerHeightAtom } = useContext(DiscoverContext) const headerHeight = useAtomValue(headerHeightAtom) - const insets = useSafeAreaInsets() - const scrollOffsetRef = useRef(0) const { animatedY } = useContext(DiscoverContext) @@ -202,6 +199,7 @@ const Tab: TabComponent = ({ tab, isSelected, ...rest }) => { animatedY.value = scrollOffsetRef.current } }, [animatedY, isSelected]) + if (isLoading) { return } @@ -220,10 +218,11 @@ const Tab: TabComponent = ({ tab, isSelected, ...rest }) => { keyExtractor={keyExtractor} getItemType={getItemType} renderItem={ItemRenderer} + automaticallyAdjustsScrollIndicatorInsets={false} scrollIndicatorInsets={{ right: -2, - top: headerHeight - insets.top, - bottom: tabHeight - insets.bottom, + top: headerHeight, + bottom: tabHeight, }} contentContainerStyle={{ paddingBottom: tabHeight, paddingTop: headerHeight }} removeClippedSubviews diff --git a/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx b/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx index fab62f2fd9..b02dd061f2 100644 --- a/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx +++ b/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx @@ -1,6 +1,5 @@ import { FeedViewType } from "@follow/constants" import { useQuery } from "@tanstack/react-query" -import { router } from "expo-router" import { useAtomValue } from "jotai" import type { FC } from "react" import type { ListRenderItem, ListRenderItemInfo } from "react-native" @@ -10,8 +9,11 @@ import Animated, { FadeInUp } from "react-native-reanimated" import { FeedIcon } from "@/src/components/ui/icon/feed-icon" import { Image } from "@/src/components/ui/image/Image" +import { ItemPressableStyle } from "@/src/components/ui/pressable/enum" import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable" import { apiClient } from "@/src/lib/api-fetch" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { FollowScreen } from "@/src/screens/(modal)/follow" import { useSubscriptionByFeedId } from "@/src/store/subscription/hooks" import { useSearchPageContext } from "../ctx" @@ -64,13 +66,18 @@ const renderItem: ListRenderItem = (props) => ( const SearchFeedItem: FC> = ({ item }) => { const isSubscribed = useSubscriptionByFeedId(item.feed?.id ?? "") + const navigation = useNavigation() return ( { if (item.feed?.id) { - router.push(`/follow?id=${item.feed.id}`) + navigation.presentControllerView(FollowScreen, { + id: item.feed.id, + type: "feed", + }) } }} > diff --git a/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx b/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx index 16082abb2d..029165fb60 100644 --- a/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx +++ b/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx @@ -1,13 +1,15 @@ import { useQuery } from "@tanstack/react-query" -import { router } from "expo-router" import { useAtomValue } from "jotai" import { memo } from "react" import { Text, View } from "react-native" import { FallbackIcon } from "@/src/components/ui/icon/fallback-icon" import { Image } from "@/src/components/ui/image/Image" +import { ItemPressableStyle } from "@/src/components/ui/pressable/enum" import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable" import { apiClient } from "@/src/lib/api-fetch" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { FollowScreen } from "@/src/screens/(modal)/follow" import { useSubscriptionByListId } from "@/src/store/subscription/hooks" import { useSearchPageContext } from "../ctx" @@ -58,12 +60,17 @@ const renderItem = ({ item }: { item: SearchResultItem }) => ( const SearchListCard = memo(({ item }: { item: SearchResultItem }) => { const isSubscribed = useSubscriptionByListId(item.list?.id ?? "") + const navigation = useNavigation() return ( { if (item.list?.id) { - router.push(`/follow?id=${item.list.id}&type=list`) + navigation.presentControllerView(FollowScreen, { + id: item.list.id, + type: "list", + }) } }} > diff --git a/apps/mobile/src/modules/discover/search-tabs/__base.tsx b/apps/mobile/src/modules/discover/search-tabs/__base.tsx index 285eae6929..73ff8d4f57 100644 --- a/apps/mobile/src/modules/discover/search-tabs/__base.tsx +++ b/apps/mobile/src/modules/discover/search-tabs/__base.tsx @@ -59,24 +59,22 @@ export function BaseSearchPageFlatList({ const windowWidth = useWindowDimensions().width return ( - <> - - + ) } const itemSeparator = ( - + ) export const ItemSeparator = () => itemSeparator diff --git a/apps/mobile/src/modules/discover/search.tsx b/apps/mobile/src/modules/discover/search.tsx index 72090e9a54..6abbacab6d 100644 --- a/apps/mobile/src/modules/discover/search.tsx +++ b/apps/mobile/src/modules/discover/search.tsx @@ -1,5 +1,4 @@ import { RSSHubCategories } from "@follow/constants" -import { router } from "expo-router" import { useAtom, useAtomValue, useSetAtom } from "jotai" import type { FC } from "react" import { useContext, useEffect, useRef, useState } from "react" @@ -17,6 +16,9 @@ import { BlurEffect } from "@/src/components/common/BlurEffect" import { getDefaultHeaderHeight } from "@/src/components/layouts/utils" import { TabBar } from "@/src/components/ui/tabview/TabBar" import { Search2CuteReIcon } from "@/src/icons/search_2_cute_re" +import { useScreenIsInSheetModal } from "@/src/lib/navigation/hooks" +import { Navigation } from "@/src/lib/navigation/Navigation" +import SearchScreen from "@/src/screens/(headless)/search" import { accentColor, useColor } from "@/src/theme/colors" import { AddFeedButton } from "../screen/action" @@ -31,7 +33,9 @@ export const SearchHeader: FC<{ }> = ({ animatedX, onLayout }) => { const frame = useSafeAreaFrame() const insets = useSafeAreaInsets() - const headerHeight = getDefaultHeaderHeight(frame, false, insets.top) + + const sheetModal = useScreenIsInSheetModal() + const headerHeight = getDefaultHeaderHeight(frame, sheetModal, insets.top) return ( { const DiscoverHeaderImpl = () => { const frame = useSafeAreaFrame() const insets = useSafeAreaInsets() - const headerHeight = getDefaultHeaderHeight(frame, false, insets.top) + const sheetModal = useScreenIsInSheetModal() + const headerHeight = getDefaultHeaderHeight(frame, sheetModal, insets.top) const { animatedX, currentTabAtom, headerHeightAtom } = useContext(DiscoverContext) const setCurrentTab = useSetAtom(currentTabAtom) const setHeaderHeight = useSetAtom(headerHeightAtom) @@ -112,7 +117,7 @@ const PlaceholerSearchBar = () => { style={styles.searchbar} className="bg-tertiary-system-fill" onPress={() => { - router.push("/search") + Navigation.rootNavigation.pushControllerView(SearchScreen) }} > { setIsFocused(false) setSearchValue("") - if (router.canGoBack()) { - router.back() + if (Navigation.rootNavigation.canGoBack()) { + Navigation.rootNavigation.back() } }} > diff --git a/apps/mobile/src/modules/entry-content/EntryReadHistory.tsx b/apps/mobile/src/modules/entry-content/EntryReadHistory.tsx index 2944478d75..60b15e0636 100644 --- a/apps/mobile/src/modules/entry-content/EntryReadHistory.tsx +++ b/apps/mobile/src/modules/entry-content/EntryReadHistory.tsx @@ -1,9 +1,10 @@ import { useQuery } from "@tanstack/react-query" -import { router } from "expo-router" import { Pressable, View } from "react-native" import { UserAvatar } from "@/src/components/ui/avatar/UserAvatar" import { apiClient } from "@/src/lib/api-fetch" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { ProfileScreen } from "@/src/screens/(modal)/profile" import { useEntry } from "@/src/store/entry/hooks" import { isInboxEntry } from "@/src/store/entry/utils" import { userActions } from "@/src/store/user/store" @@ -25,6 +26,7 @@ export const EntryReadHistory = ({ entryId }: { entryId: string }) => { staleTime: 1000 * 60 * 5, enabled: !isInboxEntry(entry), }) + const navigation = useNavigation() if (!data?.data.entryReadHistories) return null return ( @@ -45,7 +47,9 @@ export const EntryReadHistory = ({ entryId }: { entryId: string }) => { }, ]) - router.push(`/profile?userId=${user.id}`) + navigation.presentControllerView(ProfileScreen, { + userId: user.id, + }) }} className="border-system-background bg-tertiary-system-background overflow-hidden rounded-full border-2" key={userId} @@ -57,7 +61,7 @@ export const EntryReadHistory = ({ entryId }: { entryId: string }) => { ], }} > - + ) })} diff --git a/apps/mobile/src/modules/entry-content/EntryTitle.tsx b/apps/mobile/src/modules/entry-content/EntryTitle.tsx index fdba6a617d..34247fb7a9 100644 --- a/apps/mobile/src/modules/entry-content/EntryTitle.tsx +++ b/apps/mobile/src/modules/entry-content/EntryTitle.tsx @@ -1,10 +1,11 @@ import { useTypeScriptHappyCallback } from "@follow/hooks" -import { useHeaderHeight } from "@react-navigation/elements" -import { useCallback, useContext, useEffect, useState } from "react" +import { useCallback, useContext, useState } from "react" import { Text, useWindowDimensions, View } from "react-native" import type { SharedValue } from "react-native-reanimated" import Animated, { interpolate, + runOnJS, + useAnimatedReaction, useAnimatedStyle, useSharedValue, withTiming, @@ -12,20 +13,20 @@ import Animated, { import { useUISettingKey } from "@/src/atoms/settings/ui" import { DefaultHeaderBackButton } from "@/src/components/layouts/header/NavigationHeader" -import { NavigationContext } from "@/src/components/layouts/views/NavigationContext" import { NavigationBlurEffectHeader } from "@/src/components/layouts/views/SafeNavigationScrollView" import { UserAvatar } from "@/src/components/ui/avatar/UserAvatar" import { FeedIcon } from "@/src/components/ui/icon/feed-icon" +import { ScreenItemContext } from "@/src/lib/navigation/ScreenItemContext" import { EntryContentContext, useEntryContentContext } from "@/src/modules/entry-content/ctx" import { EntryContentHeaderRightActions } from "@/src/modules/entry-content/EntryContentHeaderRightActions" import { useEntry } from "@/src/store/entry/hooks" import { useFeed } from "@/src/store/feed/hooks" +import { useHeaderHeight } from "../screen/hooks/useHeaderHeight" import { EntryReadHistory } from "./EntryReadHistory" export const EntryTitle = ({ title, entryId }: { title: string; entryId: string }) => { - const { scrollY } = useContext(NavigationContext)! - + const reanimatedScrollY = useContext(ScreenItemContext).reAnimatedScrollY const [titleHeight, setTitleHeight] = useState(0) const opacityAnimatedValue = useSharedValue(0) @@ -34,30 +35,25 @@ export const EntryTitle = ({ title, entryId }: { title: string; entryId: string const [isHeaderTitleVisible, setIsHeaderTitleVisible] = useState(true) - useEffect(() => { - const id = scrollY.addListener((value) => { - if (value.value > titleHeight + headerHeight) { + useAnimatedReaction( + () => reanimatedScrollY.value, + (value) => { + if (value > titleHeight + headerHeight) { opacityAnimatedValue.value = withTiming(1, { duration: 100 }) - setIsHeaderTitleVisible(true) + runOnJS(setIsHeaderTitleVisible)(true) } else { opacityAnimatedValue.value = withTiming(0, { duration: 100 }) - setIsHeaderTitleVisible(false) + runOnJS(setIsHeaderTitleVisible)(false) } - }) - - return () => { - scrollY.removeListener(id) - } - }, [scrollY, title, titleHeight, headerHeight, opacityAnimatedValue]) + }, + ) const ctxValue = useEntryContentContext() const headerBarWidth = useWindowDimensions().width return ( <> ( ( - - - - ), - [ctxValue, entryId, opacityAnimatedValue, isHeaderTitleVisible], - )} - headerTitle={useCallback( - () => ( - + + + } + headerTitle={ + + - - {title} - - - ), - [headerBarWidth, opacityAnimatedValue, title], - )} + {title} + + + } /> { @@ -111,7 +101,7 @@ export const EntryTitle = ({ title, entryId }: { title: string; entryId: string } export const EntrySocialTitle = ({ entryId }: { entryId: string }) => { - const { scrollY } = useContext(NavigationContext)! + const reanimatedScrollY = useContext(ScreenItemContext).reAnimatedScrollY const opacityAnimatedValue = useSharedValue(0) @@ -130,28 +120,24 @@ export const EntrySocialTitle = ({ entryId }: { entryId: string }) => { const titleHeight = -60 const [isHeaderTitleVisible, setIsHeaderTitleVisible] = useState(true) - useEffect(() => { - const id = scrollY.addListener((value) => { - if (value.value > titleHeight + headerHeight) { + useAnimatedReaction( + () => reanimatedScrollY.value, + (value) => { + if (value > titleHeight + headerHeight) { opacityAnimatedValue.value = withTiming(1, { duration: 100 }) - setIsHeaderTitleVisible(true) + runOnJS(setIsHeaderTitleVisible)(true) } else { opacityAnimatedValue.value = withTiming(0, { duration: 100 }) - setIsHeaderTitleVisible(false) + runOnJS(setIsHeaderTitleVisible)(false) } - }) - - return () => { - scrollY.removeListener(id) - } - }, [scrollY, titleHeight, headerHeight, opacityAnimatedValue]) + }, + ) const ctxValue = useEntryContentContext() return ( <> ( @@ -203,7 +189,7 @@ const EntryLeftGroup = ({ canGoBack, entryId, titleOpacityShareValue }: EntryLef }) return ( - + {!hideRecentReader && ( diff --git a/apps/mobile/src/modules/entry-list/ItemSeparator.tsx b/apps/mobile/src/modules/entry-list/ItemSeparator.tsx index 39e615326b..480e280977 100644 --- a/apps/mobile/src/modules/entry-list/ItemSeparator.tsx +++ b/apps/mobile/src/modules/entry-list/ItemSeparator.tsx @@ -3,7 +3,7 @@ import { View } from "react-native" const el = ( @@ -16,7 +16,7 @@ export const ItemSeparator = () => { const el2 = ( diff --git a/apps/mobile/src/modules/entry-list/hooks.ts b/apps/mobile/src/modules/entry-list/hooks.ts index 744b54bee7..32aceb5cf7 100644 --- a/apps/mobile/src/modules/entry-list/hooks.ts +++ b/apps/mobile/src/modules/entry-list/hooks.ts @@ -29,10 +29,19 @@ export function useOnViewableItemsChanged({ changed: ViewToken[] }) => void = useNonReactiveCallback(({ viewableItems, changed }) => { debouncedFetchEntryContentByStream(viewableItems.map((item) => stableIdExtractor(item))) + const removed = changed.filter((item) => !item.isViewable) if (orientation.current === "down") { setLastViewableItems(viewableItems) - setLastRemovedItems(changed.filter((item) => !item.isViewable)) + if (removed.length > 0) { + setLastRemovedItems((prev) => { + if (prev) { + return prev.concat(removed) + } else { + return removed + } + }) + } } else { setLastRemovedItems(null) setLastViewableItems(null) @@ -40,18 +49,26 @@ export function useOnViewableItemsChanged({ }) useEffect(() => { - if (!disabled) { - if (markAsReadWhenScrolling && lastRemovedItems) { - lastRemovedItems.forEach((item) => { - unreadSyncService.markEntryAsRead(stableIdExtractor(item)) - }) - } + if (disabled) return - if (markAsReadWhenRendering && lastViewableItems) { - lastViewableItems.forEach((item) => { - unreadSyncService.markEntryAsRead(stableIdExtractor(item)) + if (markAsReadWhenScrolling && lastRemovedItems) { + lastRemovedItems.forEach((item) => { + unreadSyncService.markEntryAsRead(stableIdExtractor(item)).then(() => { + setLastRemovedItems((prev) => { + if (prev) { + return prev.filter((prevItem) => prevItem.key !== item.key) + } else { + return null + } + }) }) - } + }) + } + + if (markAsReadWhenRendering && lastViewableItems) { + lastViewableItems.forEach((item) => { + unreadSyncService.markEntryAsRead(stableIdExtractor(item)) + }) } }, [ disabled, diff --git a/apps/mobile/src/modules/entry-list/index.tsx b/apps/mobile/src/modules/entry-list/index.tsx index bad0f68707..6f76405cba 100644 --- a/apps/mobile/src/modules/entry-list/index.tsx +++ b/apps/mobile/src/modules/entry-list/index.tsx @@ -1,9 +1,9 @@ import { FeedViewType } from "@follow/constants" -import { useEffect, useMemo } from "react" -import { Animated, StyleSheet } from "react-native" -import PagerView from "react-native-pager-view" +import { useMemo } from "react" -import { selectTimeline, useSelectedFeed, useSelectedView } from "@/src/modules/screen/atoms" +import { useSelectedFeed, useSelectedView } from "@/src/modules/screen/atoms" +import { PagerList } from "@/src/modules/screen/PageList" +import { TimelineSelectorProvider } from "@/src/modules/screen/TimelineSelectorProvider" import { useEntryIdsByCategory, useEntryIdsByFeedId, @@ -11,11 +11,8 @@ import { useEntryIdsByListId, useEntryIdsByView, } from "@/src/store/entry/hooks" -import { useViewWithSubscription } from "@/src/store/subscription/hooks" -import { TimelineSelectorProvider } from "../screen/TimelineSelectorProvider" import { EntryListSelector } from "./EntryListSelector" -import { usePagerView } from "./usePagerView" export function EntryList() { const selectedFeed = useSelectedFeed() @@ -24,7 +21,13 @@ export function EntryList() { if (!selectedFeed) return null switch (selectedFeed.type) { case "view": { - return + return ( + ( + + )} + /> + ) } case "feed": { return @@ -45,48 +48,6 @@ export function EntryList() { return {Content} } -const AnimatedPagerView = Animated.createAnimatedComponent(PagerView) - -function ViewPagerList({ viewId }: { viewId: FeedViewType }) { - const activeViews = useViewWithSubscription() - const viewIdIndex = activeViews.findIndex((view) => view.view === viewId) - const { page, pagerRef, ...rest } = usePagerView({ - initialPage: viewIdIndex, - onIndexChange: (index) => { - selectTimeline({ type: "view", viewId: activeViews[index]!.view }) - }, - }) - - useEffect(() => { - if (page === viewIdIndex) return - pagerRef.current?.setPage(viewIdIndex) - }, [page, pagerRef, viewIdIndex]) - - return ( - - {useMemo( - () => - activeViews.map((view, index) => ( - - )), - [activeViews, page], - )} - - ) -} - function ViewEntryList({ viewId, active }: { viewId: FeedViewType; active: boolean }) { const entryIds = useEntryIdsByView(viewId) return @@ -116,12 +77,3 @@ function InboxEntryList({ inboxId }: { inboxId: string }) { const entryIds = useEntryIdsByInboxId(inboxId) return } - -const styles = StyleSheet.create({ - container: { - flex: 1, - }, - PagerView: { - flex: 1, - }, -}) diff --git a/apps/mobile/src/modules/entry-list/templates/EntryNormalItem.tsx b/apps/mobile/src/modules/entry-list/templates/EntryNormalItem.tsx index b535c907aa..457f0c7c95 100644 --- a/apps/mobile/src/modules/entry-list/templates/EntryNormalItem.tsx +++ b/apps/mobile/src/modules/entry-list/templates/EntryNormalItem.tsx @@ -1,7 +1,6 @@ import { FeedViewType } from "@follow/constants" -import { formatEstimatedMins } from "@follow/utils" -import { router } from "expo-router" -import { useCallback, useEffect } from "react" +import { cn, formatEstimatedMins, formatTimeToSeconds } from "@follow/utils" +import { useCallback, useEffect, useMemo, useState } from "react" import { ActivityIndicator, StyleSheet, Text, TouchableOpacity, View } from "react-native" import ReAnimated, { useAnimatedStyle, useSharedValue, withSpring } from "react-native-reanimated" @@ -11,11 +10,15 @@ import { preloadWebViewEntry } from "@/src/components/native/webview/EntryConten import { RelativeDateTime } from "@/src/components/ui/datetime/RelativeDateTime" import { FeedIcon } from "@/src/components/ui/icon/feed-icon" import { Image } from "@/src/components/ui/image/Image" +import { ItemPressableStyle } from "@/src/components/ui/pressable/enum" import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable" import { gentleSpringPreset } from "@/src/constants/spring" import { PauseCuteFiIcon } from "@/src/icons/pause_cute_fi" import { PlayCuteFiIcon } from "@/src/icons/play_cute_fi" +import { useNavigation } from "@/src/lib/navigation/hooks" import { getAttachmentState, player } from "@/src/lib/player" +import { getHorizontalScrolling } from "@/src/modules/screen/atoms" +import { EntryDetailScreen } from "@/src/screens/(stack)/entries/[entryId]" import { useEntry } from "@/src/store/entry/hooks" import { getInboxFrom } from "@/src/store/entry/utils" import { useFeed } from "@/src/store/feed/hooks" @@ -29,12 +32,17 @@ export function EntryNormalItem({ entryId, extraData }: { entryId: string; extra const from = getInboxFrom(entry) const feed = useFeed(entry?.feedId as string) const view = useEntryListContextView() - + const navigation = useNavigation() const handlePress = useCallback(() => { - if (!entry) return - preloadWebViewEntry(entry) - router.push(`/entries/${entryId}`) - }, [entryId, entry]) + const isHorizontalScrolling = getHorizontalScrolling() + if (entry && !isHorizontalScrolling) { + preloadWebViewEntry(entry) + navigation.pushControllerView(EntryDetailScreen, { + entryId, + view, + }) + } + }, [entryId, entry, navigation, view]) const unreadZoomSharedValue = useSharedValue(entry?.read ? 0 : 1) @@ -59,25 +67,37 @@ export function EntryNormalItem({ entryId, extraData }: { entryId: string; extra }, [entry, entry?.read, unreadZoomSharedValue]) const thumbnailRatio = useUISettingKey("thumbnailRatio") - if (!entry) return - const { title, description, publishedAt, media, attachments } = entry - - const coverImage = media?.[0] + const coverImage = entry?.media?.[0] const image = coverImage?.url const blurhash = coverImage?.blurhash - const audio = attachments?.find((attachment) => attachment.mime_type?.startsWith("audio/")) + const audio = entry?.attachments?.find((attachment) => attachment.mime_type?.startsWith("audio/")) const audioState = getAttachmentState(extraData, audio) const isPlaying = audioState === "playing" const isLoading = audioState === "loading" - const durationInSeconds = attachments ? attachments[0]?.duration_in_seconds : 0 - const estimatedMins = durationInSeconds ? Math.floor(durationInSeconds / 60) : undefined + const estimatedMins = useMemo(() => { + let durationInSeconds = audio?.duration_in_seconds + // durationInSeconds's format like 00:00:00 or 4000 + if (durationInSeconds && Number.isNaN(+durationInSeconds)) { + // @ts-expect-error durationInSeconds is string + durationInSeconds = formatTimeToSeconds(durationInSeconds) + } + + return durationInSeconds && Math.floor(durationInSeconds / 60) + }, [audio?.duration_in_seconds]) + + if (!entry) return return ( - + ) : null} - {!!title && ( + {!!entry.title && ( - {title.trim()} + {entry.title.trim()} )} - {view !== FeedViewType.Notifications && !!description && ( + {view !== FeedViewType.Notifications && !!entry.description && ( - {description} + {entry.description} )} @@ -119,18 +139,7 @@ export function EntryNormalItem({ entryId, extraData }: { entryId: string; extra {image && (thumbnailRatio === "square" ? ( - + ) : ( { + const [isLoaded, setIsLoaded] = useState(false) + if (height === width || !height || !width) { + return + } // Calculate aspect ratio and determine dimensions // Ensure the larger dimension is capped at 96px while maintaining aspect ratio @@ -213,6 +226,9 @@ const AspectRatioImage = ({ className="overflow-hidden rounded-md" > { + setIsLoaded(true) + }} proxy={{ width: 96, }} @@ -223,11 +239,40 @@ const AspectRatioImage = ({ width: scaledWidth, height: scaledHeight, }} + transition={100} blurhash={blurhash} - className="border-secondary-system-background rounded-md border" + className={cn( + "rounded-md", + isLoaded ? "bg-transparent" : "bg-secondary-system-background", + )} contentFit="cover" /> ) } + +const SquareImage = ({ image, blurhash }: { image: string; blurhash?: string }) => { + const [isLoaded, setIsLoaded] = useState(false) + return ( + { + setIsLoaded(true) + }} + blurhash={blurhash} + className={cn( + "size-24 overflow-hidden rounded-lg", + isLoaded ? "bg-transparent" : "bg-secondary-system-background", + )} + contentFit="cover" + /> + ) +} diff --git a/apps/mobile/src/modules/entry-list/templates/EntrySocialItem.tsx b/apps/mobile/src/modules/entry-list/templates/EntrySocialItem.tsx index 533d17c21d..6c12f6968a 100644 --- a/apps/mobile/src/modules/entry-list/templates/EntrySocialItem.tsx +++ b/apps/mobile/src/modules/entry-list/templates/EntrySocialItem.tsx @@ -1,5 +1,4 @@ import { FeedViewType } from "@follow/constants" -import { router } from "expo-router" import { useCallback, useEffect, useMemo } from "react" import { Pressable, Text, View } from "react-native" import ReAnimated, { useAnimatedStyle, useSharedValue, withSpring } from "react-native-reanimated" @@ -13,6 +12,10 @@ import { Image } from "@/src/components/ui/image/Image" import { ItemPressableStyle } from "@/src/components/ui/pressable/enum" import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable" import { gentleSpringPreset } from "@/src/constants/spring" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { getHorizontalScrolling } from "@/src/modules/screen/atoms" +import { EntryDetailScreen } from "@/src/screens/(stack)/entries/[entryId]" +import { FeedScreen } from "@/src/screens/(stack)/feeds/[feedId]" import { useEntry } from "@/src/store/entry/hooks" import { useFeed } from "@/src/store/feed/hooks" import { unreadSyncService } from "@/src/store/unread/store" @@ -25,10 +28,17 @@ export function EntrySocialItem({ entryId }: { entryId: string }) { const feed = useFeed(entry?.feedId || "") + const navigation = useNavigation() const handlePress = useCallback(() => { - unreadSyncService.markEntryAsRead(entryId) - router.push(`/entries/${entryId}?view=${FeedViewType.SocialMedia}`) - }, [entryId]) + const isHorizontalScrolling = getHorizontalScrolling() + if (!isHorizontalScrolling) { + unreadSyncService.markEntryAsRead(entryId) + navigation.pushControllerView(EntryDetailScreen, { + entryId, + view: FeedViewType.SocialMedia, + }) + } + }, [entryId, navigation]) const unreadZoomSharedValue = useSharedValue(entry?.read ? 0 : 1) @@ -57,6 +67,7 @@ export function EntrySocialItem({ entryId }: { entryId: string }) { const memoedMediaUrlList = useMemo(() => { return entry?.media?.map((i) => i.url) ?? [] }, [entry]) + if (!entry) return const { description, publishedAt, media } = entry @@ -64,6 +75,7 @@ export function EntrySocialItem({ entryId }: { entryId: string }) { return ( { - router.push(`/feeds/${entry.feedId}`) + if (!entry.feedId) return + navigation.pushControllerView(FeedScreen, { + feedId: entry.feedId, + }) }} > {entry.authorAvatar ? ( diff --git a/apps/mobile/src/modules/feed-drawer/drawer.tsx b/apps/mobile/src/modules/feed-drawer/drawer.tsx deleted file mode 100644 index da1ef9fad0..0000000000 --- a/apps/mobile/src/modules/feed-drawer/drawer.tsx +++ /dev/null @@ -1,71 +0,0 @@ -import type { PropsWithChildren } from "react" -import { useCallback } from "react" -import { useWindowDimensions, View } from "react-native" -import { Drawer } from "react-native-drawer-layout" -import type { PanGestureType } from "react-native-gesture-handler/lib/typescript/handlers/gestures/panGesture" - -import { isIOS } from "@/src/lib/platform" - -import { useFeedDrawer, useIsDrawerSwipeDisabled } from "./atoms" -import { CollectionPanel } from "./collection-panel" -import { FeedPanel } from "./feed-panel" - -export const FeedDrawer = ({ children }: PropsWithChildren) => { - const { isDrawerOpen, openDrawer, closeDrawer } = useFeedDrawer() - const winDim = useWindowDimensions() - const isDrawerSwipeDisabled = useIsDrawerSwipeDisabled() - - const renderDrawerContent = useCallback(() => , []) - const configureGestureHandler = useCallback( - (handler: PanGestureType) => { - const swipeEnabled = !isDrawerSwipeDisabled - if (swipeEnabled) { - if (isDrawerOpen) { - return handler.activeOffsetX([-1, 1]) - } else { - return ( - handler - // Any movement to the left is a pager swipe - // so fail the drawer gesture immediately. - .failOffsetX(-1) - // Don't rush declaring that a movement to the right - // is a drawer swipe. It could be a vertical scroll. - .activeOffsetX(5) - ) - } - } else { - // Fail the gesture immediately. - // This seems more reliable than the `swipeEnabled` prop. - // With `swipeEnabled` alone, the gesture may freeze after toggling off/on. - return handler.failOffsetX([0, 0]).failOffsetY([0, 0]) - } - }, - [isDrawerOpen, isDrawerSwipeDisabled], - ) - - return ( - - {children} - - ) -} - -const DrawerContent = () => { - return ( - - - - - ) -} diff --git a/apps/mobile/src/modules/feed-drawer/feed-panel.tsx b/apps/mobile/src/modules/feed-drawer/feed-panel.tsx index 107b968eb6..422d5f01fb 100644 --- a/apps/mobile/src/modules/feed-drawer/feed-panel.tsx +++ b/apps/mobile/src/modules/feed-drawer/feed-panel.tsx @@ -1,6 +1,4 @@ import { cn } from "@follow/utils" -import { HeaderHeightContext } from "@react-navigation/elements" -import { router } from "expo-router" import type { FC } from "react" import { createContext, memo, useContext, useState } from "react" import { @@ -18,10 +16,13 @@ import { useSharedValue } from "react-native-reanimated" import { useSafeAreaInsets } from "react-native-safe-area-context" import { BottomTabBarHeightContext } from "@/src/components/layouts/tabbar/contexts/BottomTabBarHeightContext" +import { NavigationHeaderHeightContext } from "@/src/components/layouts/views/NavigationHeaderContext" import { AccordionItem } from "@/src/components/ui/accordion/AccordionItem" import { FeedIcon } from "@/src/components/ui/icon/feed-icon" import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable" import { MingcuteRightLine } from "@/src/icons/mingcute_right_line" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { FeedScreen } from "@/src/screens/(stack)/feeds/[feedId]" import { useFeed, usePrefetchFeed } from "@/src/store/feed/hooks" import { useList } from "@/src/store/list/hooks" import { useSortedUngroupedSubscription, useSubscription } from "@/src/store/subscription/hooks" @@ -53,7 +54,7 @@ export const FeedPanel = () => { }} /> - + { - + ) } @@ -141,10 +142,12 @@ const CategoryGrouped = memo( const rotateValue = useAnimatedValue(1) const selectedCollection = useSelectedCollection() const view = selectedCollection.type === "view" ? selectedCollection.viewId : undefined + const navigation = useNavigation() if (view === undefined) { console.warn("view is undefined", selectedCollection) return null } + return ( diff --git a/apps/mobile/src/modules/feed/FollowFeed.tsx b/apps/mobile/src/modules/feed/FollowFeed.tsx index 9eaa529672..b9093ac123 100644 --- a/apps/mobile/src/modules/feed/FollowFeed.tsx +++ b/apps/mobile/src/modules/feed/FollowFeed.tsx @@ -1,23 +1,24 @@ import { FeedViewType } from "@follow/constants" import { zodResolver } from "@hookform/resolvers/zod" -import { StackActions } from "@react-navigation/native" -import { router, useNavigation } from "expo-router" import { useEffect, useState } from "react" import { Controller, useForm } from "react-hook-form" import { ActivityIndicator, Text, View } from "react-native" import { useSafeAreaInsets } from "react-native-safe-area-context" import { z } from "zod" -import { ModalHeaderSubmitButton } from "@/src/components/common/ModalSharedComponents" -import { ModalHeader } from "@/src/components/layouts/header/ModalHeader" -import { SafeModalScrollView } from "@/src/components/layouts/views/SafeModalScrollView" +import { HeaderSubmitButton } from "@/src/components/layouts/header/HeaderElements" +import { + NavigationBlurEffectHeader, + SafeNavigationScrollView, +} from "@/src/components/layouts/views/SafeNavigationScrollView" import { FormProvider } from "@/src/components/ui/form/FormProvider" import { FormLabel } from "@/src/components/ui/form/Label" import { FormSwitch } from "@/src/components/ui/form/Switch" import { TextField } from "@/src/components/ui/form/TextField" import { GroupedInsetListCard } from "@/src/components/ui/grouped/GroupedList" import { FeedIcon } from "@/src/components/ui/icon/feed-icon" -import { useIsRouteOnlyOne } from "@/src/hooks/useIsRouteOnlyOne" +import { useCanDismiss, useNavigation } from "@/src/lib/navigation/hooks" +import { useSetModalScreenOptions } from "@/src/lib/navigation/ScreenOptionsContext" import { FeedViewSelector } from "@/src/modules/feed/view-selector" import { useFeed, usePrefetchFeed, usePrefetchFeedByUrl } from "@/src/store/feed/hooks" import { useSubscriptionByFeedId } from "@/src/store/subscription/hooks" @@ -79,9 +80,10 @@ function FollowImpl(props: { feedId: string }) { }) const [isLoading, setIsLoading] = useState(false) - const routeOnlyOne = useIsRouteOnlyOne() + const navigate = useNavigation() - const parentRoute = navigate.getParent() + + const canDismiss = useCanDismiss() const submit = async () => { setIsLoading(true) const values = form.getValues() @@ -98,42 +100,38 @@ function FollowImpl(props: { feedId: string }) { setIsLoading(false) }) - if (router.canDismiss()) { - router.dismissAll() - - if (!routeOnlyOne) { - parentRoute?.dispatch(StackActions.popToTop()) - } + if (canDismiss) { + navigate.dismiss() } else { - // If we can't dismiss, redirect to the root route - router.replace("/") + navigate.back() } } const insets = useSafeAreaInsets() const { isValid, isDirty } = form.formState - const navigation = useNavigation() + + const setScreenOptions = useSetModalScreenOptions() useEffect(() => { - navigation.setOptions({ - gestureEnabled: !isDirty, + setScreenOptions({ + preventNativeDismiss: isDirty, }) - }, [isDirty, navigation]) + }, [isDirty, setScreenOptions]) if (!feed?.id) { return Feed ({id}) not found } return ( - - - + ) } diff --git a/apps/mobile/src/modules/list/FollowList.tsx b/apps/mobile/src/modules/list/FollowList.tsx index 8bd1774636..3ad1343303 100644 --- a/apps/mobile/src/modules/list/FollowList.tsx +++ b/apps/mobile/src/modules/list/FollowList.tsx @@ -1,15 +1,14 @@ import { FeedViewType } from "@follow/constants" import { zodResolver } from "@hookform/resolvers/zod" import { useQuery } from "@tanstack/react-query" -import { router, useNavigation } from "expo-router" import { useEffect } from "react" import { Controller, useForm } from "react-hook-form" import { ActivityIndicator, Alert, StyleSheet, Text, View } from "react-native" import { z } from "zod" -import { ModalHeaderSubmitButton } from "@/src/components/common/ModalSharedComponents" -import { ModalHeader } from "@/src/components/layouts/header/ModalHeader" +import { HeaderSubmitButton } from "@/src/components/layouts/header/HeaderElements" import { SafeModalScrollView } from "@/src/components/layouts/views/SafeModalScrollView" +import { NavigationBlurEffectHeader } from "@/src/components/layouts/views/SafeNavigationScrollView" import { FormProvider } from "@/src/components/ui/form/FormProvider" import { FormLabel } from "@/src/components/ui/form/Label" import { FormSwitch } from "@/src/components/ui/form/Switch" @@ -18,6 +17,8 @@ import { GroupedInsetListCard } from "@/src/components/ui/grouped/GroupedList" import { IconWithFallback } from "@/src/components/ui/icon/fallback-icon" import { PowerIcon } from "@/src/icons/power" import { apiClient } from "@/src/lib/api-fetch" +import { useNavigation, useScreenIsInSheetModal } from "@/src/lib/navigation/hooks" +import { useSetModalScreenOptions } from "@/src/lib/navigation/ScreenOptionsContext" import { toast } from "@/src/lib/toast" import { useList } from "@/src/store/list/hooks" import { listSyncServices } from "@/src/store/list/store" @@ -65,6 +66,8 @@ const Impl = (props: { id: string }) => { }) const { isValid, isDirty } = form.formState + const isModal = useScreenIsInSheetModal() + const navigation = useNavigation() const submit = async () => { const payload = form.getValues() @@ -81,7 +84,11 @@ const Impl = (props: { id: string }) => { await $method({ json: body, }) - router.dismiss() + if (isModal) { + navigation.dismiss() + } else { + navigation.back() + } toast.success(isSubscribed ? "List updated" : "List followed") } if (list.fee && !isSubscribed) { @@ -109,21 +116,21 @@ const Impl = (props: { id: string }) => { const isLoading = false - const navigation = useNavigation() + const setModalOptions = useSetModalScreenOptions() useEffect(() => { - navigation.setOptions({ + setModalOptions({ gestureEnabled: !isDirty, }) - }, [isDirty, navigation]) + }, [isDirty, setModalOptions]) return ( - async function onSubmit(values: FormValue) { + const result = formSchema.safeParse(values) + if (!result.success) { + const issue = result.error.issues[0] + Alert.alert("Invalid email or password", issue?.message) + return + } + await signIn .email( { - email: values.email, - password: values.password, + email: result.data.email, + password: result.data.password, }, { headers: await getTokenHeaders(), @@ -39,66 +46,44 @@ async function onSubmit(values: FormValue) { } // @ts-expect-error if (res.data.twoFactorRedirect) { - router.push("/2fa") + Navigation.rootNavigation.presentControllerView(TwoFactorAuthScreen) } }) .catch((error) => { - toast.error(error.message) + Alert.alert(error.message) }) } -function Input({ - control, - name, - ...rest -}: TextInputProps & { - control: Control - name: keyof FormValue -}) { - const { field } = useController({ - control, - name, - }) - return ( - - ) -} - export function EmailLogin() { - const { control, handleSubmit, formState } = useForm({ - resolver: zodResolver(formSchema), - defaultValues: { - email: "", - password: "", - }, - }) + const emailValueRef = useRef("") + const passwordValueRef = useRef("") const submitMutation = useMutation({ mutationFn: onSubmit, }) - const login = handleSubmit((values) => { - submitMutation.mutate(values) - }) + const onLogin = useCallback(() => { + submitMutation.mutate({ + email: emailValueRef.current, + password: passwordValueRef.current, + }) + }, [submitMutation]) + const navigation = useNavigation() return ( - { + emailValueRef.current = text + }} + selectionColor={accentColor} hitSlop={20} autoCapitalize="none" autoCorrect={false} keyboardType="email-address" autoComplete="email" - control={control} - name="email" placeholder="Email" className="text-text flex-1" returnKeyType="next" @@ -109,35 +94,40 @@ export function EmailLogin() { - { + passwordValueRef.current = text + }} + selectionColor={accentColor} hitSlop={20} autoCapitalize="none" autoCorrect={false} autoComplete="current-password" - control={control} - name="password" placeholder="Password" className="text-text flex-1" secureTextEntry returnKeyType="go" - onSubmitEditing={() => { - login() - }} + onSubmitEditing={onLogin} /> - router.push("/sign-up")}> - Don't have an account? Sign Up + navigation.presentControllerView(SignUpScreen)} + > + Don't have an account? - router.push("/forget-password")}> + navigation.presentControllerView(ForgetPasswordScreen)} + > Forgot password? diff --git a/apps/mobile/src/modules/login/index.tsx b/apps/mobile/src/modules/login/index.tsx index 60cc7bd91a..b1d7a03518 100644 --- a/apps/mobile/src/modules/login/index.tsx +++ b/apps/mobile/src/modules/login/index.tsx @@ -1,4 +1,3 @@ -import { Link, router } from "expo-router" import { useCallback } from "react" import { Text, TouchableWithoutFeedback, View } from "react-native" import { KeyboardController } from "react-native-keyboard-controller" @@ -6,36 +5,58 @@ import Animated, { useAnimatedStyle, useSharedValue } from "react-native-reanima import * as ContextMenu from "zeego/context-menu" import { Logo } from "@/src/components/ui/logo" -import { TermsMarkdown } from "@/src/screens/(headless)/terms" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { NavigationLink } from "@/src/lib/navigation/NavigationLink" +import { useScaleHeight } from "@/src/lib/responsive" +import { TermsMarkdown, TermsScreen } from "@/src/screens/(headless)/terms" import { EmailLogin } from "./email" import { SocialLogin } from "./social" export function Login() { + const scaledHeight = useScaleHeight() + const logoSize = scaledHeight(80) + const gapSize = scaledHeight(28) + const fontSize = scaledHeight(28) + const lineHeight = scaledHeight(32) + return ( - - { - KeyboardController.dismiss() - }} - accessible={false} - > - - - - Sign in to Follow - - - - - - - - - or - + + + { + KeyboardController.dismiss() + }} + accessible={false} + > + + + + Sign in to Folo + + + + + + + + + or + + + - @@ -58,13 +79,18 @@ const TermsCheckBox = () => { } const TermsText = () => { + const navigation = useNavigation() return ( - + Terms of Service - + @@ -72,8 +98,8 @@ const TermsText = () => { { - router.push("/terms") - }, [])} + navigation.pushControllerView(TermsScreen) + }, [navigation])} > {() => ( diff --git a/apps/mobile/src/modules/onboarding/feeds-english.json b/apps/mobile/src/modules/onboarding/feeds-english.json new file mode 100644 index 0000000000..126457dd70 --- /dev/null +++ b/apps/mobile/src/modules/onboarding/feeds-english.json @@ -0,0 +1,263 @@ +[ + { + "feedId": "43255084704601095", + "title": "a16z Podcast", + "url": "https://feeds.simplecast.com/JGE3yC0V", + "language": "English" + }, + { + "feedId": "83007794771225600", + "title": "Andrew Huberman - YouTube", + "url": "rsshub://youtube/user/@hubermanlab", + "language": "English", + "view": 3 + }, + { + "feedId": "62128288597853189", + "title": "Cal Newport", + "url": "https://calnewport.com/feed/", + "language": "English" + }, + { + "feedId": "43881675446885376", + "title": "Collab Fund", + "url": "http://feeds.feedburner.com/collabfund", + "language": "English" + }, + { + "feedId": "41359648684677175", + "title": "Derek Sivers blog", + "url": "https://sive.rs/en.atom", + "language": "English" + }, + { + "feedId": "52325519371718656", + "title": "Hacker News", + "url": "rsshub://hackernews", + "language": "English" + }, + { + "feedId": "41381007770949636", + "title": "IGN Articles", + "url": "https://www.ign.com/rss/articles/feed?tags=games", + "language": "English" + }, + { + "feedId": "59461847827447808", + "title": "International homepage", + "url": "https://www.ft.com/rss/home", + "language": "English" + }, + { + "feedId": "52333046926856207", + "title": "Kotaku", + "url": "https://kotaku.com/rss", + "language": "English" + }, + { + "feedId": "41768239731545104", + "title": "LessWrong", + "url": "https://www.lesswrong.com/feed.xml?view=curated-rss", + "language": "English" + }, + { + "feedId": "41375850878492672", + "title": "Lex Fridman - YouTube", + "url": "rsshub://youtube/user/%40lexfridman", + "language": "English", + "view": 3 + }, + { + "feedId": "55258726035912721", + "title": "Marginal REVOLUTION", + "url": "https://marginalrevolution.com/feed", + "language": "English" + }, + { + "feedId": "42109057149046784", + "title": "Marques Brownlee - YouTube", + "url": "rsshub://youtube/user/@mkbhd", + "language": "English", + "view": 3 + }, + { + "feedId": "41768239731545089", + "title": "MIT Technology Review", + "url": "https://www.technologyreview.com/feed/", + "language": "English" + }, + { + "feedId": "42127302309630072", + "title": "Mr. Money Mustache", + "url": "https://feeds.feedburner.com/mrmoneymustache", + "language": "English" + }, + { + "feedId": "41356263889737728", + "title": "NASA Astronomy Picture of the Day", + "url": "rsshub://nasa/apod", + "language": "English" + }, + { + "feedId": "55130722692595739", + "title": "Nassim Taleb", + "url": "https://nassimtaleb.org/feed/", + "language": "English" + }, + { + "feedId": "41699925856588800", + "title": "Nat Geo Photo of the Day", + "url": "rsshub://natgeo/dailyphoto", + "language": "English" + }, + { + "feedId": "42127302309630013", + "title": "Nautilus", + "url": "https://nautil.us/feed/", + "language": "English" + }, + { + "feedId": "41147805276726370", + "title": "Obsidian Changelog", + "url": "https://obsidian.md/changelog.xml", + "language": "English" + }, + { + "feedId": "41468521403732992", + "title": "Paul Graham - Essays", + "url": "rsshub://paulgraham/articles", + "language": "English" + }, + { + "feedId": "55130722692595736", + "title": "Peter Attia", + "url": "https://peterattiamd.com/feed/", + "language": "English" + }, + { + "feedId": "41382261184290816", + "title": "Product Hunt — The best new products, every day", + "url": "https://www.producthunt.com/feed", + "language": "English" + }, + { + "feedId": "43254816999905282", + "title": "Research & Insights", + "url": "https://www.bridgewater.com/research-and-insights.rss", + "language": "English" + }, + { + "feedId": "41147805276726402", + "title": "RSSHub has new routes", + "url": "rsshub://rsshub/routes", + "language": "English" + }, + { + "feedId": "66860831563739166", + "title": "Sabine Hossenfelder", + "url": "https://www.youtube.com/feeds/videos.xml?channel_id=UC1yNl2E66ZzKApQdRuTQ4tw", + "language": "English", + "view": 3 + }, + { + "feedId": "49470377330653207", + "title": "Seth's Blog", + "url": "https://seths.blog/feed/", + "language": "English" + }, + { + "feedId": "41795937311945747", + "title": "Stratechery by Ben Thompson", + "url": "https://stratechery.com/feed/", + "language": "English" + }, + { + "feedId": "59299066394742784", + "title": "TechCrunch", + "url": "https://techcrunch.com/feed/", + "language": "English" + }, + { + "feedId": "49470377330653193", + "title": "The Blog of Author Tim Ferriss", + "url": "https://tim.blog/feed/", + "language": "English" + }, + { + "feedId": "57993144602143744", + "title": "The Memo by Howard Marks", + "url": "https://rss.art19.com/the-memo-by-howard-marks", + "language": "English" + }, + { + "feedId": "100080366298125312", + "title": "The Verge", + "url": "https://www.theverge.com/rss/index.xml", + "language": "English" + }, + { + "feedId": "41572238278099968", + "title": "The world in brief | The Economist", + "url": "rsshub://economist/espresso", + "language": "English" + }, + { + "feedId": "41368476124603392", + "title": "Trending repositories on GitHub this week · GitHub", + "url": "rsshub://github/trending/weekly/any", + "language": "English" + }, + { + "feedId": "41461870197170196", + "title": "Trending repositories on GitHub today · GitHub", + "url": "rsshub://github/trending/daily/any", + "language": "English" + }, + { + "feedId": "87076619508029440", + "title": "Twitter @Balaji", + "url": "rsshub://twitter/user/balajis", + "language": "English", + "view": 1 + }, + { + "feedId": "59795737540541440", + "title": "Twitter @David Sinclair", + "url": "rsshub://twitter/user/davidasinclair", + "language": "English", + "view": 1 + }, + { + "feedId": "100411504863520768", + "title": "Twitter @Elon Musk", + "url": "rsshub://twitter/user/elonmusk", + "language": "English", + "view": 1 + }, + { + "feedId": "41215396143077382", + "title": "Twitter @Follow", + "url": "rsshub://twitter/user/follow_app_", + "language": "English", + "view": 1 + }, + { + "feedId": "55866936513101824", + "title": "Twitter @James Clear", + "url": "rsshub://twitter/user/JamesClear", + "language": "English", + "view": 1 + }, + { + "feedId": "41342818712721408", + "title": "Wait But Why", + "url": "https://waitbutwhy.com/feed?code=c6f56c4214621ab98b86acbcae6b4405", + "language": "English" + }, + { + "feedId": "41965184796582014", + "title": "WIRED", + "url": "https://www.wired.com/feed/rss", + "language": "English" + } +] diff --git a/apps/mobile/src/modules/onboarding/feeds.json b/apps/mobile/src/modules/onboarding/feeds.json new file mode 100644 index 0000000000..00717d3050 --- /dev/null +++ b/apps/mobile/src/modules/onboarding/feeds.json @@ -0,0 +1,1438 @@ +[ + { + "feedId": "41358761177015296", + "title": "知乎热榜 - 全站", + "url": "rsshub://zhihu/hot/total", + "language": "Chinese" + }, + { + "feedId": "41147805268337669", + "title": "V2EX-最热主题", + "url": "rsshub://v2ex/topics/hot", + "language": "Chinese" + }, + { + "feedId": "41147805276726272", + "title": "少数派", + "url": "rsshub://sspai/index", + "language": "Chinese" + }, + { + "feedId": "41374278075966464", + "title": "V2EX-最新主题", + "url": "rsshub://v2ex/topics/latest", + "language": "Chinese" + }, + { + "feedId": "64124473013636098", + "title": "Followin", + "url": "rsshub://followin/news", + "language": "English" + }, + { + "feedId": "78806242632741888", + "title": "bilibili 排行榜-全站", + "url": "rsshub://bilibili/ranking/0", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "41358830592746496", + "title": "微博热搜榜", + "url": "rsshub://weibo/search/hot", + "language": "Chinese", + "view": 1 + }, + { + "feedId": "41719081557593134", + "title": "小众软件", + "url": "https://feeds.appinn.com/appinns/", + "language": "Chinese" + }, + { + "feedId": "41443203209057309", + "title": "财新网 - 最新文章", + "url": "rsshub://caixin/latest", + "language": "Chinese" + }, + { + "feedId": "100411504863520768", + "title": "Twitter @Elon Musk", + "url": "rsshub://twitter/user/elonmusk", + "language": "English", + "view": 1 + }, + { + "feedId": "100020530265058357", + "title": "阮一峰的网络日志", + "url": "https://feeds.feedburner.com/ruanyifeng", + "language": "Chinese" + }, + { + "feedId": "41324816676184077", + "title": "Twitter @DIŸgöd ☀️", + "url": "rsshub://twitter/user/DIYgod", + "language": "Chinese", + "view": 1 + }, + { + "feedId": "41147805276726311", + "title": "Twitter @Joshua Meng 🟠", + "url": "rsshub://twitter/user/JoshuaRSS3", + "language": "English", + "view": 1 + }, + { + "feedId": "41147805276726275", + "title": "潮流周刊", + "url": "https://weekly.tw93.fun/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41223694984583170", + "title": "Hi, DIYgod", + "url": "https://diygod.cc/feed", + "language": "Chinese" + }, + { + "feedId": "56445572623398912", + "title": "简书首页", + "url": "rsshub://jianshu/home", + "language": "Chinese" + }, + { + "feedId": "60338304723722240", + "title": "实时财经快讯 - FastBull", + "url": "rsshub://fastbull/express-news", + "language": "Chinese" + }, + { + "feedId": "55611390687386624", + "title": "格隆汇快讯-7x24小时市场快讯-财经市场热点", + "url": "rsshub://gelonghui/live", + "language": "Chinese" + }, + { + "feedId": "49375919416104960", + "title": "深潮TechFlow - 快讯", + "url": "rsshub://techflowpost/express", + "language": "Chinese" + }, + { + "feedId": "55982073122828305", + "title": "TED Talks Daily", + "url": "https://feeds.acast.com/public/shows/67587e77c705e441797aff96", + "language": "English" + }, + { + "feedId": "72541715399995392", + "title": "TheBlockBeats - 快讯", + "url": "rsshub://theblockbeats/newsflash/0", + "language": "Chinese" + }, + { + "feedId": "100184911354754055", + "title": "小Lin说", + "url": "https://www.youtube.com/feeds/videos.xml?channel_id=UCilwQlk62k1z7aUEZPOB6yw", + "language": "Chinese" + }, + { + "feedId": "100185810923910148", + "title": "张小珺Jùn｜商业访谈录", + "url": "https://feed.xyzfm.space/dk4yh3pkpjp3", + "language": "Chinese" + }, + { + "feedId": "56584656988676096", + "title": "迷因电波", + "url": "rsshub://xiaoyuzhou/podcast/61d52b3bee197a3aac3dac44", + "language": "Chinese" + }, + { + "feedId": "76051724651752448", + "title": "极致音乐汇 的 bilibili 空间", + "url": "rsshub://bilibili/user/video/1691501735", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "56141546151433216", + "title": "胡子观币 - YouTube", + "url": "rsshub://youtube/user/%40huziguanbi", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "66701376672681984", + "title": "AP Top News - AP News", + "url": "rsshub://apnews/api/apf-topnews", + "language": "English" + }, + { + "feedId": "44366244616936448", + "title": "金十数据", + "url": "rsshub://jin10", + "language": "Chinese" + }, + { + "feedId": "52325519371718656", + "title": "Hacker News", + "url": "rsshub://hackernews", + "language": "English" + }, + { + "feedId": "41359648684677132", + "title": "介绍 on SuperTechFans", + "url": "https://www.supertechfans.com/cn/index.xml", + "language": "Chinese" + }, + { + "feedId": "41147805276726279", + "title": "律动BlockBeats", + "url": "https://api.theblockbeats.news/v1/open-api/home-xml", + "language": "Chinese" + }, + { + "feedId": "54390728350522368", + "title": "New Cryptocurrency Listing", + "url": "rsshub://binance/announcement/new-cryptocurrency-listing", + "language": "" + }, + { + "feedId": "41572238278099968", + "title": "The world in brief | The Economist", + "url": "rsshub://economist/espresso", + "language": "English" + }, + { + "feedId": "72635895363612672", + "title": "Stock Edge", + "url": "rsshub://stockedge/daily-updates/news", + "language": "English" + }, + { + "feedId": "72541421314282496", + "title": "Bloomberg - News", + "url": "rsshub://bloomberg/%2F", + "language": "English" + }, + { + "feedId": "74739941830489088", + "title": "少数派", + "url": "https://sspai.com/feed", + "language": "Chinese" + }, + { + "feedId": "41489882518602759", + "title": "36氪 - 24小时热榜", + "url": "rsshub://36kr/hot-list", + "language": "Chinese" + }, + { + "feedId": "41356263889737728", + "title": "NASA Astronomy Picture of the Day", + "url": "rsshub://nasa/apod", + "language": "English", + "view": 2 + }, + { + "feedId": "41719081557593132", + "title": "异次元软件世界", + "url": "https://feed.iplaysoft.com/", + "language": "Chinese" + }, + { + "feedId": "55304291112288259", + "title": "每日一图-北京天文馆", + "url": "rsshub://bjp/apod", + "language": "Chinese", + "view": 2 + }, + { + "feedId": "100011185145959424", + "title": "知乎每日精选", + "url": "https://www.zhihu.com/rss", + "language": "Chinese" + }, + { + "feedId": "60275763819153427", + "title": "爱范儿", + "url": "https://www.ifanr.com/feed", + "language": "" + }, + { + "feedId": "41147805276726402", + "title": "RSSHub has new routes", + "url": "rsshub://rsshub/routes", + "language": "English" + }, + { + "feedId": "63585517712903168", + "title": "AInvest - Latest News", + "url": "rsshub://ainvest/news", + "language": "English" + }, + { + "feedId": "41374973344769024", + "title": "阮一峰的网络日志", + "url": "https://www.ruanyifeng.com/blog/atom.xml?code=2eb8b88b9919b38e2ce2269980fba393", + "language": "Chinese" + }, + { + "feedId": "100372081228582912", + "title": "极客公园", + "url": "https://www.geekpark.net/rss", + "language": "Chinese" + }, + { + "feedId": "41215011978385465", + "title": "阮一峰的网络日志", + "url": "http://www.ruanyifeng.com/blog/atom.xml", + "language": "Chinese" + }, + { + "feedId": "41443203209057308", + "title": "纽约时报中文网", + "url": "rsshub://nytimes", + "language": "Chinese" + }, + { + "feedId": "41572238273905680", + "title": "IT之家", + "url": "https://www.ithome.com/rss/", + "language": "Chinese" + }, + { + "feedId": "42520977153904661", + "title": "今日热门-什么值得买好文", + "url": "rsshub://smzdm/haowen/1", + "language": "Chinese" + }, + { + "feedId": "41486365723425792", + "title": "信息差——独立开发者出海周刊", + "url": "https://gapis.money/rss.xml", + "language": "Chinese" + }, + { + "feedId": "55653085540614144", + "title": "影视飓风 的 bilibili 空间", + "url": "rsshub://bilibili/user/video/946974", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "41147805276726276", + "title": "美团技术团队", + "url": "https://tech.meituan.com/feed/", + "language": "Chinese" + }, + { + "feedId": "41342818708527117", + "title": "宝玉的分享", + "url": "https://s.baoyu.io/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41215011978385440", + "title": "Pseudoyu", + "url": "https://www.pseudoyu.com/zh/index.xml", + "language": "Chinese" + }, + { + "feedId": "41477724771147777", + "title": "老胡的周刊", + "url": "https://weekly.howie6879.com/rss/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41147805268337688", + "title": "Owen的博客", + "url": "https://www.owenyoung.com/atom.xml", + "language": "Chinese" + }, + { + "feedId": "56535849521479680", + "title": "有知有行 - 全部", + "url": "rsshub://youzhiyouxing/materials/0", + "language": "Chinese" + }, + { + "feedId": "58477260865774592", + "title": "奇客的资讯，重要的东西", + "url": "rsshub://solidot/www", + "language": "Chinese" + }, + { + "feedId": "41503779521380352", + "title": "Epic Games Store - Free Games", + "url": "rsshub://epicgames/freegames/en-US/US", + "language": "English" + }, + { + "feedId": "41397727810093057", + "title": "奇客Solidot–传递最新科技情报", + "url": "https://www.solidot.org/index.rss", + "language": "Chinese" + }, + { + "feedId": "41342818712721411", + "title": "月光博客", + "url": "https://www.williamlong.info/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41461870197170196", + "title": "Trending repositories on GitHub today · GitHub", + "url": "rsshub://github/trending/daily/any", + "language": "English" + }, + { + "feedId": "73553160421921792", + "title": "少数派 - 派早报", + "url": "https://feeds.feedburner.com/sspai/paizaobao", + "language": "Chinese" + }, + { + "feedId": "72485769266542592", + "title": "资讯列表 - 人人影视", + "url": "rsshub://yyets/article/all", + "language": "Chinese" + }, + { + "feedId": "41377721131229184", + "title": "小Lin说 - YouTube", + "url": "rsshub://youtube/user/%40xiao_lin_shuo", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "41572238273905683", + "title": "InfoQ 推荐", + "url": "rsshub://infoq/recommend", + "language": "Chinese" + }, + { + "feedId": "41342818708527107", + "title": "虹线", + "url": "https://1q43.blog/feed/", + "language": "Chinese" + }, + { + "feedId": "41492096674907154", + "title": "科技圈🎗在花频道📮 - Telegram Channel", + "url": "rsshub://telegram/channel/TestFlightCN", + "language": "Chinese" + }, + { + "feedId": "56531023179226112", + "title": "HelloGitHub 月刊", + "url": "https://hellogithub.com/rss", + "language": "Chinese" + }, + { + "feedId": "58463916731079680", + "title": "技术爬爬虾 的 bilibili 空间", + "url": "rsshub://bilibili/user/video/316183842", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "59403591690626048", + "title": "阮一峰的网络日志", + "url": "http://feeds.feedburner.com/ruanyifeng", + "language": "Chinese" + }, + { + "feedId": "41342818704332814", + "title": " 太隐 ", + "url": "https://wangyurui.com/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41373653871256591", + "title": "竹新社 - Telegram Channel", + "url": "rsshub://telegram/channel/tnews365", + "language": "Chinese" + }, + { + "feedId": "43254215382531115", + "title": "Decohack", + "url": "https://decohack.com/feed/", + "language": "English" + }, + { + "feedId": "41147805272531976", + "title": "Tw93 Blog", + "url": "https://tw93.fun/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41147805272531968", + "title": "Randy's Blog", + "url": "https://lutaonan.com/rss.xml", + "language": "Chinese" + }, + { + "feedId": "59241875117740032", + "title": "分享创造日报", + "url": "https://v2ex-create.nexmm.com/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41364963690045440", + "title": "王志安 - YouTube", + "url": "rsshub://youtube/user/%40wangzhian", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "71830193505483776", + "title": "McKinsey Greater China - 洞见", + "url": "rsshub://mckinsey/cn/25", + "language": "Chinese" + }, + { + "feedId": "56701589104355328", + "title": "金色财经 - 全部", + "url": "rsshub://jinse/lives/0", + "language": "Chinese" + }, + { + "feedId": "100344100469080064", + "title": "机核", + "url": "https://www.gcores.com/rss", + "language": "Chinese" + }, + { + "feedId": "41370691926515712", + "title": "小众软件", + "url": "https://www.appinn.com/feed/", + "language": "Chinese" + }, + { + "feedId": "43301307059705856", + "title": "站酷总榜设计_创意作品榜_第411期-站酷ZCOOL", + "url": "rsshub://zcool/top/design", + "language": "Chinese" + }, + { + "feedId": "100020530265058356", + "title": "让小产品的独立变现更简单 - ezindie.com", + "url": "https://www.ezindie.com/feed/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41707595233790976", + "title": "司机社综合周排行榜", + "url": "rsshub://xsijishe/rank/weekly", + "language": "English" + }, + { + "feedId": "57030789598275584", + "title": "专题报告 - AI量化知识库 - BigQuant", + "url": "rsshub://bigquant/collections", + "language": "Chinese" + }, + { + "feedId": "41795937307751551", + "title": "AIGC Weekly", + "url": "https://quaily.com/op7418/feed/atom", + "language": "Chinese" + }, + { + "feedId": "41342818708527124", + "title": "槿呈Goidea", + "url": "https://justgoidea.com/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41382542902990938", + "title": "云风的 BLOG", + "url": "https://blog.codingnow.com/atom.xml", + "language": "" + }, + { + "feedId": "41368476124603392", + "title": "Trending repositories on GitHub this week · GitHub", + "url": "rsshub://github/trending/weekly/any", + "language": "English" + }, + { + "feedId": "41427688948323328", + "title": "pixiv 日排行", + "url": "rsshub://pixiv/ranking/day", + "language": "Japanese", + "view": 2 + }, + { + "feedId": "41423034778090522", + "title": "周热门-什么值得买好文", + "url": "rsshub://smzdm/haowen/7", + "language": "Chinese" + }, + { + "feedId": "52347176714948614", + "title": "Readhub - 每日早报 - Readhub", + "url": "rsshub://readhub/daily", + "language": "Chinese" + }, + { + "feedId": "41147805272531983", + "title": "印记", + "url": "https://yinji.org/feed", + "language": "Chinese" + }, + { + "feedId": "57678974871415816", + "title": "7x24小时快讯", + "url": "rsshub://fx678/kx", + "language": "Chinese" + }, + { + "feedId": "41343619752158231", + "title": "酷 壳 – CoolShell", + "url": "https://coolshell.cn/feed", + "language": "Chinese" + }, + { + "feedId": "53014658920611840", + "title": "V2EX", + "url": "https://www.v2ex.com/index.xml", + "language": "Chinese" + }, + { + "feedId": "41470051648495616", + "title": "ahhhhfs｜A姐分享 - Telegram Channel", + "url": "rsshub://telegram/channel/abskoop", + "language": "Chinese" + }, + { + "feedId": "100020530265058354", + "title": "理想生活实验室", + "url": "https://www.toodaylab.com/feed", + "language": "Chinese" + }, + { + "feedId": "41343619752158230", + "title": "BMPI", + "url": "https://www.bmpi.dev/index.xml", + "language": "Chinese" + }, + { + "feedId": "53352050212694016", + "title": "小声逼逼· 软件|资讯|抽奖 - Telegram Channel", + "url": "rsshub://telegram/channel/me888888888888", + "language": "Chinese" + }, + { + "feedId": "41470869403557888", + "title": "LINUX DO - 最新话题", + "url": "https://linux.do/latest.rss", + "language": "Chinese" + }, + { + "feedId": "55086756782700544", + "title": "阿里、夸克、百度等网盘4K影视资源 - Telegram Channel", + "url": "rsshub://telegram/channel/Aliyun_4K_Movies", + "language": "Chinese" + }, + { + "feedId": "61661363869599744", + "title": "社群 - 韭研公社-研究共享，茁壮成长（原韭菜公社）", + "url": "rsshub://jiuyangongshe/community", + "language": "Chinese" + }, + { + "feedId": "41342818704332815", + "title": "Another Dayu", + "url": "https://anotherdayu.com/feed/", + "language": "Chinese" + }, + { + "feedId": "53033422584152064", + "title": "热帖 - 雪球", + "url": "rsshub://xueqiu/hots", + "language": "Chinese" + }, + { + "feedId": "41147805272531984", + "title": "张鑫旭-鑫空间-鑫生活", + "url": "https://www.zhangxinxu.com/wordpress/feed/", + "language": "Chinese" + }, + { + "feedId": "100020530265058315", + "title": "发现频道 - 小众软件官方论坛", + "url": "https://meta.appinn.net/c/faxian/10.rss", + "language": "Chinese" + }, + { + "feedId": "42855045334971393", + "title": "知乎日报", + "url": "https://feedx.net/rss/zhihudaily.xml", + "language": "Chinese" + }, + { + "feedId": "54799935373253632", + "title": "阿里云盘吧 - Telegram Channel", + "url": "rsshub://telegram/channel/Q66Share", + "language": "Chinese" + }, + { + "feedId": "41381007770949637", + "title": "Mac玩儿法", + "url": "https://www.waerfa.com/feed", + "language": "Chinese" + }, + { + "feedId": "54410158488493056", + "title": "零度解说 - YouTube", + "url": "rsshub://youtube/user/%40%E9%9B%B6%E5%BA%A6%E8%A7%A3%E8%AF%B4", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "52340201851637826", + "title": "1Link.Fun 科技周刊 | 每天获取一条高质量的链接", + "url": "https://1link.fun/rss/", + "language": "Chinese" + }, + { + "feedId": "41358489461613605", + "title": "CatCoding", + "url": "https://catcoding.me/atom.xml", + "language": "Chinese" + }, + { + "feedId": "52324311483129856", + "title": "阿里云盘发布频道 - Telegram Channel", + "url": "rsshub://telegram/channel/shareAliyun", + "language": "Chinese" + }, + { + "feedId": "42176727619514397", + "title": "晚点 - 最新报道", + "url": "rsshub://latepost", + "language": "Chinese" + }, + { + "feedId": "41501088760162311", + "title": "一觉醒来发生了什么 - 即刻圈子", + "url": "rsshub://jike/topic/553870e8e4b0cafb0a1bef68", + "language": "Chinese" + }, + { + "feedId": "41511702474276884", + "title": "司机社综合月排行榜", + "url": "rsshub://xsijishe/rank/monthly", + "language": "English" + }, + { + "feedId": "42177758872391680", + "title": "Mediastorm影视飓风 - YouTube", + "url": "rsshub://youtube/user/%40mediastorm6801", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "41359648684677181", + "title": "编程随想的博客", + "url": "https://feeds2.feedburner.com/programthink", + "language": "Chinese" + }, + { + "feedId": "41215396143077382", + "title": "Twitter @Follow", + "url": "rsshub://twitter/user/follow_app_", + "language": "English", + "view": 1 + }, + { + "feedId": "41492096674907156", + "title": "即刻精选 - Telegram Channel", + "url": "rsshub://telegram/channel/jike_collection", + "language": "Chinese" + }, + { + "feedId": "44920595085335552", + "title": "虎嗅网", + "url": "https://www.huxiu.com/rss/0.xml", + "language": "Chinese" + }, + { + "feedId": "41382542902990947", + "title": "土木坛子", + "url": "https://tumutanzi.com/feed", + "language": "Chinese" + }, + { + "feedId": "55765163242101760", + "title": "cnBeta.COM - 中文业界资讯站", + "url": "rsshub://cnbeta", + "language": "Chinese" + }, + { + "feedId": "41719104290720768", + "title": "[今日主题] 技術討論區 | 草榴社區 - t66y.com", + "url": "rsshub://t66y/7", + "language": "Chinese" + }, + { + "feedId": "41472267692906513", + "title": "二丫讲梵", + "url": "https://wiki.eryajf.net/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41147805272531986", + "title": "椒盐豆豉", + "url": "https://blog.douchi.space/index.xml", + "language": "Chinese" + }, + { + "feedId": "57995444932781056", + "title": "GQ", + "url": "rsshub://gq/news", + "language": "English" + }, + { + "feedId": "41383550788723712", + "title": " Airing 的博客 ", + "url": "https://blog.ursb.me/feed.xml", + "language": "English" + }, + { + "feedId": "41572238273905689", + "title": "澎湃新闻 - 首页头条", + "url": "rsshub://thepaper/featured", + "language": "Chinese" + }, + { + "feedId": "100020530265058329", + "title": "卡瓦邦噶！", + "url": "https://www.kawabangga.com/feed", + "language": "Chinese" + }, + { + "feedId": "55216086191994902", + "title": "有用经验", + "url": "https://yyjingyan.com/index.php/feed/", + "language": "Chinese" + }, + { + "feedId": "41343619752158241", + "title": " 61’s life ", + "url": "https://61.life/feed.xml", + "language": "Chinese" + }, + { + "feedId": "65017927657675779", + "title": "36氪", + "url": "https://36kr.com/feed", + "language": "Chinese" + }, + { + "feedId": "54851744068228138", + "title": "极客湾Geekerwan 的 bilibili 空间", + "url": "rsshub://bilibili/user/video/25876945", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "67804472989767680", + "title": "36氪资讯热榜", + "url": "https://feeds.feedburner.com/36kr/hot-list", + "language": "Chinese" + }, + { + "feedId": "41359836954400775", + "title": "胡涂说", + "url": "https://hutusi.com/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41572238273905693", + "title": "纽约时报中文网 - 中英对照版", + "url": "rsshub://nytimes/dual", + "language": "English" + }, + { + "feedId": "57966370728127498", + "title": "Breaking News Headlines | Latest Views | Reuters", + "url": "rsshub://reuters/breakingviews", + "language": "English" + }, + { + "feedId": "54737464283059214", + "title": "精品MAC应用分享", + "url": "https://xclient.info/feed/", + "language": "Chinese" + }, + { + "feedId": "41425168656712704", + "title": "RSSHub 有新路由啦", + "url": "rsshub://rsshub/routes/zh", + "language": "Chinese" + }, + { + "feedId": "41374014364620801", + "title": "槽边往事", + "url": "https://www.hecaitou.com/feeds/posts/default", + "language": "English" + }, + { + "feedId": "55160895115655188", + "title": "人民日报", + "url": "https://plink.anyfeeder.com/people-daily", + "language": "Chinese" + }, + { + "feedId": "58488203296243712", + "title": "人人影视-今日播出", + "url": "rsshub://yyets/today", + "language": "Chinese" + }, + { + "feedId": "54772566650461198", + "title": "CnGal - 每周速报", + "url": "rsshub://cngal/weekly", + "language": "Chinese" + }, + { + "feedId": "84458689264416768", + "title": " 虎嗅 ", + "url": "https://rss.huxiu.com/", + "language": "Chinese" + }, + { + "feedId": "41359690177602678", + "title": "MacTalk-池建强的随想录", + "url": "https://macshuo.com/?feed=rss2", + "language": "Chinese" + }, + { + "feedId": "48039983835900989", + "title": "電腦玩物", + "url": "http://feeds.feedburner.com/playpc", + "language": "Chinese" + }, + { + "feedId": "41397727810093071", + "title": "见字如面", + "url": "https://hiwannz.com/feed", + "language": "Chinese" + }, + { + "feedId": "41359648680482843", + "title": "拾月", + "url": "https://www.skyue.com/feed/", + "language": "Chinese" + }, + { + "feedId": "55116179974345728", + "title": "彭博社最新报道", + "url": "https://bloombergnew.buzzing.cc/feed.xml", + "language": "English" + }, + { + "feedId": "64999354512147456", + "title": "财新周刊 Caixin Weekly", + "url": "https://the.bi/s/rawatssj2a2mog", + "language": "Chinese" + }, + { + "feedId": "100020530265058314", + "title": "#UNTAG", + "url": "https://rss.utgd.net/feed/", + "language": "Chinese" + }, + { + "feedId": "41374113210459144", + "title": "Twitter @宝玉", + "url": "rsshub://twitter/user/dotey", + "language": "English" + }, + { + "feedId": "42331815237783605", + "title": "莫比乌斯", + "url": "https://onojyun.com/feed/", + "language": "Chinese" + }, + { + "feedId": "41699925856588800", + "title": "Nat Geo Photo of the Day", + "url": "rsshub://natgeo/dailyphoto", + "language": "English" + }, + { + "feedId": "42864851888759808", + "title": "积薪 - 文章", + "url": "https://darmau.co/zh/article/rss.xml", + "language": "Chinese" + }, + { + "feedId": "52347176714948645", + "title": "如有乐享", + "url": "https://51.ruyo.net/feed", + "language": "Chinese" + }, + { + "feedId": "41147805276726317", + "title": "pixiv 周排行", + "url": "rsshub://pixiv/ranking/week", + "language": "Yoruba", + "view": 2 + }, + { + "feedId": "41359836954400804", + "title": "王登科-DK博客", + "url": "https://greatdk.com/feed", + "language": "Chinese" + }, + { + "feedId": "100020530265058337", + "title": "离别歌", + "url": "https://www.leavesongs.com/feed/", + "language": "Chinese" + }, + { + "feedId": "43236301826954240", + "title": "不良林 - YouTube", + "url": "rsshub://youtube/user/%40bulianglin", + "language": "Chinese", + "view": 3 + }, + { + "feedId": "41719081557593137", + "title": "我不是咕咕鸽", + "url": "https://blog.laoda.de/rss.xml", + "language": "Chinese" + }, + { + "feedId": "42006425715388416", + "title": "pinlei榜-11-3小时", + "url": "rsshub://smzdm/ranking/pinlei/11/3", + "language": "Chinese" + }, + { + "feedId": "41373653871256582", + "title": "风向旗参考快讯 - Telegram Channel", + "url": "rsshub://telegram/channel/xhqcankao", + "language": "Chinese" + }, + { + "feedId": "54349807700270080", + "title": "知行小酒馆", + "url": "rsshub://xiaoyuzhou/podcast/6013f9f58e2f7ee375cf4216", + "language": "Chinese" + }, + { + "feedId": "41343619752158234", + "title": "大破进击", + "url": "https://jesor.me/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41424303016727552", + "title": "老高與小茉 Mr & Mrs Gao - YouTube", + "url": "rsshub://youtube/user/%40laogao", + "language": "Chinese" + }, + { + "feedId": "55064361156653076", + "title": "子舒的博客", + "url": "https://zishu.me/index.xml", + "language": "Chinese" + }, + { + "feedId": "41359690177602681", + "title": "奔跑中的奶酪", + "url": "https://www.runningcheese.com/feed", + "language": "Chinese" + }, + { + "feedId": "42579624844251167", + "title": "东西智库 – 专注中国制造业高质量发展", + "url": "rsshub://dx2025", + "language": "English" + }, + { + "feedId": "100020530265058338", + "title": "Sam Altman", + "url": "https://blog.samaltman.com/posts.atom", + "language": "English" + }, + { + "feedId": "41343619752158254", + "title": "OneV's Den", + "url": "https://onevcat.com/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41359648684677164", + "title": "KAIX.IN", + "url": "https://kaix.in/feed/", + "language": "Chinese" + }, + { + "feedId": "60954952175832064", + "title": "每日一拍", + "url": "rsshub://500px/tribe/set/302261e93f0441c9a5323a565279b0e3", + "language": "Chinese" + }, + { + "feedId": "41461870201364486", + "title": "少数派 -- Matrix", + "url": "rsshub://sspai/matrix", + "language": "Chinese" + }, + { + "feedId": "41342818704332817", + "title": "Limboy's Essays", + "url": "https://limboy.me/index.xml", + "language": "Chinese" + }, + { + "feedId": "41440449356332064", + "title": "Blog | Phodal - A Growth Engineer", + "url": "https://www.phodal.com/blog/feeds/rss/", + "language": "Chinese" + }, + { + "feedId": "57164874420868096", + "title": "小Lin说 的 bilibili 空间", + "url": "rsshub://bilibili/user/video/520819684", + "language": "Chinese" + }, + { + "feedId": "41343619752158232", + "title": "罗磊的独立博客", + "url": "https://luolei.org/feed/", + "language": "Chinese" + }, + { + "feedId": "41423034778090515", + "title": "四火的唠叨", + "url": "https://www.raychase.net/feed", + "language": "Chinese" + }, + { + "feedId": "41465715829593091", + "title": "华尔街日报", + "url": "https://feedx.net/rss/wsj.xml", + "language": "Chinese" + }, + { + "feedId": "41342818716915713", + "title": "0x01 byte", + "url": "https://1byte.io/articles/index.xml", + "language": "Chinese" + }, + { + "feedId": "52508301310328842", + "title": "南方周末-新闻", + "url": "rsshub://infzm/2", + "language": "Chinese" + }, + { + "feedId": "41358489461613601", + "title": "可能吧", + "url": "https://feeds.feedburner.com/kenengbarss", + "language": "Chinese" + }, + { + "feedId": "41388765730464778", + "title": "GeekPlux", + "url": "https://geekplux.com/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41223694984583197", + "title": "静かな森", + "url": "https://innei.in/feed", + "language": "English" + }, + { + "feedId": "41461870201364482", + "title": "《联合早报》-中港台-即时", + "url": "rsshub://zaobao/realtime/china", + "language": "Chinese" + }, + { + "feedId": "41391604968812544", + "title": "纵横四海", + "url": "rsshub://xiaoyuzhou/podcast/62694abdb221dd5908417d1e", + "language": "Chinese" + }, + { + "feedId": "55855418052542483", + "title": "Elmagnifico's Blog", + "url": "https://elmagnifico.tech/feed.xml", + "language": "English" + }, + { + "feedId": "41459996870678548", + "title": "掘金本周最热", + "url": "https://rsshub.bestblogs.dev/juejin/trending/all/weekly", + "language": "Chinese" + }, + { + "feedId": "41147805268337670", + "title": "小米有品众筹", + "url": "rsshub://xiaomiyoupin/crowdfunding", + "language": "Chinese" + }, + { + "feedId": "48039983835900987", + "title": "分享创造", + "url": "https://www.v2ex.com/feed/create.xml", + "language": "Chinese" + }, + { + "feedId": "100191225529340928", + "title": "游研社", + "url": "https://www.yystv.cn/rss/feed", + "language": "Chinese" + }, + { + "feedId": "41380827636851712", + "title": "声动早咖啡", + "url": "rsshub://xiaoyuzhou/podcast/60de7c003dd577b40d5a40f3", + "language": "Chinese" + }, + { + "feedId": "41667838436032513", + "title": "小球飞鱼", + "url": "https://mantyke.icu/index.xml", + "language": "Chinese" + }, + { + "feedId": "61937382761420802", + "title": "蓝点网", + "url": "https://www.landiannews.com/feed", + "language": "Chinese" + }, + { + "feedId": "48039983835900988", + "title": "书伴", + "url": "https://feeds.feedburner.com/bookfere", + "language": "Chinese" + }, + { + "feedId": "55311155740901376", + "title": "有知有行 - 全部", + "url": "rsshub://youzhiyouxing/materials", + "language": "Chinese" + }, + { + "feedId": "100157598308965376", + "title": "V2EX - 创意", + "url": "https://www.v2ex.com/feed/tab/creative.xml", + "language": "Chinese" + }, + { + "feedId": "41798923170845776", + "title": "初之音", + "url": "https://www.himiku.com/feed/", + "language": "Chinese" + }, + { + "feedId": "57419814936869901", + "title": "不死鸟 - 分享为王官网", + "url": "https://iui.su/feed/", + "language": "Chinese" + }, + { + "feedId": "70126938108248064", + "title": "财联社快讯", + "url": "https://feeds.crabpi.com/cls-telegraph", + "language": "Chinese" + }, + { + "feedId": "41461870197170197", + "title": "豌豆花下猫", + "url": "https://pythoncat.top/rss.xml", + "language": "Chinese" + }, + { + "feedId": "54083984224404480", + "title": "酷安图文 - 编辑精选", + "url": "rsshub://coolapk/tuwen", + "language": "Chinese" + }, + { + "feedId": "41359690177602682", + "title": "唐巧的博客", + "url": "https://blog.devtang.com/atom.xml", + "language": "Chinese" + }, + { + "feedId": "69670759328198656", + "title": "IMDb Top 250 Movies", + "url": "rsshub://imdb/chart/top", + "language": "English" + }, + { + "feedId": "100020530265058320", + "title": "卢昌海个人主页", + "url": "https://www.changhai.org/feed.xml", + "language": "Chinese" + }, + { + "feedId": "100080366298125312", + "title": "The Verge", + "url": "https://www.theverge.com/rss/index.xml", + "language": "English" + }, + { + "feedId": "41527687227405342", + "title": "吾爱破解论坛", + "url": "https://wechat2rss.xlab.app/feed/90c827b8290310a96ef80a13df9dbcc06ab69892.xml", + "language": "English" + }, + { + "feedId": "54945423970185247", + "title": "晚晴幽草轩", + "url": "https://www.jeffjade.com/atom.xml", + "language": "Chinese" + }, + { + "feedId": "67048226833723428", + "title": "ahhhhfs", + "url": "https://www.ahhhhfs.com/feed/", + "language": "Chinese" + }, + { + "feedId": "42331815237783583", + "title": "木木木木木", + "url": "https://immmmm.com/atom.xml", + "language": "English" + }, + { + "feedId": "41768239731545103", + "title": "laike9m's blog", + "url": "https://laike9m.com/blog/rss/", + "language": "Chinese" + }, + { + "feedId": "55576111518416909", + "title": "豆瓣电影本周口碑榜", + "url": "https://feedx.net/rss/doubanmvweek.xml", + "language": "Chinese" + }, + { + "feedId": "41147805272531974", + "title": "t9t.io", + "url": "https://blog.t9t.io/atom.xml", + "language": "Chinese" + }, + { + "feedId": "41359836954400809", + "title": "月球背面", + "url": "https://moonvy.com/blog/rss.xml", + "language": "Chinese" + }, + { + "feedId": "41459996870678529", + "title": "量子位", + "url": "https://www.qbitai.com/feed", + "language": "Chinese" + }, + { + "feedId": "41376358301079552", + "title": "三联生活周刊", + "url": "https://plink.anyfeeder.com/weixin/lifeweek", + "language": "Chinese" + }, + { + "feedId": "41768239731545124", + "title": "依云's Blog", + "url": "https://blog.lilydjwg.me/feed?code=c6f56c4214621ab98b86acbcae6b4405", + "language": "Chinese" + }, + { + "feedId": "41359648684677153", + "title": "海德沙龙（HeadSalon）", + "url": "https://headsalon.org/feed", + "language": "Chinese" + }, + { + "feedId": "41667283719128072", + "title": "技术小黑屋", + "url": "https://droidyue.com/atom.xml", + "language": "Chinese" + }, + { + "feedId": "41342818704332811", + "title": "陈仓颉", + "url": "https://imzm.im/feed/", + "language": "Chinese" + }, + { + "feedId": "55130722692595719", + "title": "笨方法学写作", + "url": "https://www.cnfeat.com/feed.xml", + "language": "Chinese" + }, + { + "feedId": "55877082660306949", + "title": "数据发布 - 国家统计局", + "url": "rsshub://gov/stats/sj/zxfb", + "language": "Chinese" + }, + { + "feedId": "43789642870889493", + "title": "Tony Bai", + "url": "https://tonybai.com/feed/", + "language": "Chinese" + }, + { + "feedId": "55157116408461312", + "title": "Macin", + "url": "https://macin.org/atom.xml", + "language": "Chinese" + }, + { + "feedId": "100020530265058312", + "title": "歸藏的AI工具箱", + "url": "https://werss.bestblogs.dev/feeds/MP_WXS_3540975510.atom", + "language": "Chinese" + }, + { + "feedId": "41324816676184075", + "title": "Yu’s Life - Telegram Channel", + "url": "rsshub://telegram/channel/pseudoyulife", + "language": "Chinese" + }, + { + "feedId": "43374760408291328", + "title": "Epic Games Store - Free Games", + "url": "rsshub://epicgames/freegames/zh-CN/CN", + "language": "Chinese" + }, + { + "feedId": "100127086160845862", + "title": "一天一篇经济学人(双语)", + "url": "https://plink.anyfeeder.com/weixin/Economist_fans", + "language": "Chinese" + }, + { + "feedId": "56587971459683328", + "title": "技术爬爬虾 TechShrimp - YouTube", + "url": "rsshub://youtube/user/%40Tech_Shrimp", + "language": "Chinese" + }, + { + "feedId": "41359648684677157", + "title": "阳志平的网志", + "url": "https://www.yangzhiping.com/feed.xml", + "language": "Chinese" + }, + { + "feedId": "41459996870678583", + "title": "机器之心", + "url": "https://www.jiqizhixin.com/rss", + "language": "Chinese" + } +] diff --git a/apps/mobile/src/modules/onboarding/preset.ts b/apps/mobile/src/modules/onboarding/preset.ts index bfbafb49c2..66fc146c98 100644 --- a/apps/mobile/src/modules/onboarding/preset.ts +++ b/apps/mobile/src/modules/onboarding/preset.ts @@ -1,4 +1,8 @@ import { FeedViewType } from "@follow/constants" +import { getLocales } from "expo-localization" + +import feeds from "./feeds.json" +import englishFeeds from "./feeds-english.json" export type PresetFeedConfig = { title: string @@ -7,116 +11,21 @@ export type PresetFeedConfig = { view: FeedViewType } -export const presetFeeds: PresetFeedConfig[] = [ - { - feedId: "41358761177015296", - title: "知乎热榜 - 全站", - url: "rsshub://zhihu/hot/total", - view: FeedViewType.Articles, - }, - { - feedId: "100020530265058357", - title: "阮一峰的网络日志", - url: "https://feeds.feedburner.com/ruanyifeng", - view: FeedViewType.Articles, - }, +export const englishPresetFeeds: PresetFeedConfig[] = englishFeeds.map((feed) => ({ + view: FeedViewType.Articles, + ...feed, +})) - { - feedId: "41358830592746496", - title: "微博热搜榜", - url: "rsshub://weibo/search/hot", - view: FeedViewType.SocialMedia, - }, - { - feedId: "100411504863520768", - title: "Twitter @Elon Musk", - url: "rsshub://twitter/user/elonmusk", - view: FeedViewType.SocialMedia, - }, - { - feedId: "41324816676184077", - title: "Twitter @DIŸgöd ☀️", - url: "rsshub://twitter/user/DIYgod", - view: FeedViewType.SocialMedia, - }, +export const otherPresetFeeds: PresetFeedConfig[] = feeds + // .filter((feed) => feed.language === "Chinese") + .map((feed) => ({ + view: FeedViewType.Articles, + ...feed, + })) - { - feedId: "78806242632741888", - title: "bilibili 排行榜-全站", - url: "rsshub://bilibili/ranking/0", - view: FeedViewType.Videos, - }, +const locales = getLocales() +// `getLocales` guaranteed to contain at least 1 element. +const languageTag = locales[0]?.languageTag || "en-US" +const isEnglishUser = languageTag.startsWith("en") - { - feedId: "60338304723722240", - title: "实时财经快讯 - FastBull", - url: "rsshub://fastbull/express-news", - view: FeedViewType.Articles, - }, - { - feedId: "55611390687386624", - title: "格隆汇快讯-7x24小时市场快讯-财经市场热点", - url: "rsshub://gelonghui/live", - view: FeedViewType.Articles, - }, - { - feedId: "49375919416104960", - title: "深潮TechFlow - 快讯", - url: "rsshub://techflowpost/express", - view: FeedViewType.Articles, - }, - { - feedId: "55982073122828305", - title: "TED Talks Daily", - url: "https://feeds.acast.com/public/shows/67587e77c705e441797aff96", - view: FeedViewType.Articles, - }, - { - feedId: "72541715399995392", - title: "TheBlockBeats - 快讯", - url: "rsshub://theblockbeats/newsflash/0", - view: FeedViewType.Articles, - }, - { - feedId: "100184911354754055", - title: "小Lin说", - url: "https://www.youtube.com/feeds/videos.xml?channel_id=UCilwQlk62k1z7aUEZPOB6yw", - view: FeedViewType.Videos, - }, - { - feedId: "100185810923910148", - title: "张小珺Jùn｜商业访谈录", - url: "https://feed.xyzfm.space/dk4yh3pkpjp3", - view: FeedViewType.Articles, - }, - { - feedId: "56584656988676096", - title: "迷因电波", - url: "rsshub://xiaoyuzhou/podcast/61d52b3bee197a3aac3dac44", - view: FeedViewType.Articles, - }, - { - feedId: "76051724651752448", - title: "极致音乐汇 的 bilibili 空间", - url: "rsshub://bilibili/user/video/1691501735", - view: FeedViewType.Videos, - }, - { - feedId: "66701376672681984", - title: "AP Top News - AP News", - url: "rsshub://apnews/api/apf-topnews", - view: FeedViewType.Articles, - }, - { - feedId: "44366244616936448", - title: "金十数据", - url: "rsshub://jin10", - view: FeedViewType.Articles, - }, - { - feedId: "52325519371718656", - title: "Hacker News", - url: "rsshub://hackernews", - view: FeedViewType.Articles, - }, -] +export const presetFeeds = isEnglishUser ? englishPresetFeeds : otherPresetFeeds diff --git a/apps/mobile/src/modules/onboarding/step-interests.tsx b/apps/mobile/src/modules/onboarding/step-interests.tsx index c7a44780d0..d8470fab5c 100644 --- a/apps/mobile/src/modules/onboarding/step-interests.tsx +++ b/apps/mobile/src/modules/onboarding/step-interests.tsx @@ -5,7 +5,6 @@ import Animated, { FadeIn, FadeOut } from "react-native-reanimated" import { Search3CuteReIcon } from "@/src/icons/search_3_cute_re" import { Shuffle2CuteReIcon } from "@/src/icons/shuffle_2_cute_re" -import { toast } from "@/src/lib/toast" import { useSubscription } from "@/src/store/subscription/hooks" import { subscriptionSyncService } from "@/src/store/subscription/store" import { accentColor } from "@/src/theme/colors" @@ -13,28 +12,6 @@ import { accentColor } from "@/src/theme/colors" import type { PresetFeedConfig } from "./preset" import { presetFeeds } from "./preset" -const subscribeFeed = async (config: PresetFeedConfig) => { - await subscriptionSyncService.subscribe({ - feedId: config.feedId, - title: config.title, - url: config.url, - view: config.view, - category: "", - isPrivate: false, - }) - - toast.success(`Subscribed to ${config.title}`, { - position: "bottom", - }) -} - -const unsubscribeFeed = async (feedId: string) => { - await subscriptionSyncService.unsubscribe(feedId) - toast.success(`Unsubscribed from feed`, { - position: "bottom", - }) -} - export const StepInterests = () => { const [displayFeeds, setDisplayFeeds] = useState(presetFeeds.slice(0, 7)) @@ -66,7 +43,7 @@ export const StepInterests = () => { {displayFeeds.map((feed) => ( - + ))} @@ -74,18 +51,43 @@ export const StepInterests = () => { ) } -const FeedChip = (feed: PresetFeedConfig) => { - const isSubscribed = useSubscription(feed.feedId) +const FeedChip = ({ feed }: { feed: PresetFeedConfig }) => { + const subscription = useSubscription(feed.feedId) + const [loading, setLoading] = useState(false) + const [isSubscribed, setIsSubscribed] = useState(!!subscription) const handleSubscribe = useCallback( async (feed: PresetFeedConfig) => { + if (loading) return + setLoading(true) if (isSubscribed) { - await unsubscribeFeed(feed.feedId) + try { + setIsSubscribed(false) + await subscriptionSyncService.unsubscribe(feed.feedId) + } catch { + setIsSubscribed(true) + } finally { + setLoading(false) + } return } - await subscribeFeed(feed) + try { + setIsSubscribed(true) + await subscriptionSyncService.subscribe({ + feedId: feed.feedId, + title: feed.title, + url: feed.url, + view: feed.view, + category: "", + isPrivate: false, + }) + } catch { + setIsSubscribed(false) + } finally { + setLoading(false) + } }, - [isSubscribed], + [isSubscribed, loading], ) return ( diff --git a/apps/mobile/src/modules/onboarding/step-preferences.tsx b/apps/mobile/src/modules/onboarding/step-preferences.tsx index c9349f3a47..aeb64074a1 100644 --- a/apps/mobile/src/modules/onboarding/step-preferences.tsx +++ b/apps/mobile/src/modules/onboarding/step-preferences.tsx @@ -1,4 +1,3 @@ -import { router } from "expo-router" import type { PropsWithChildren } from "react" import { ActivityIndicator, Pressable, Text, TouchableOpacity, View } from "react-native" import { useColor } from "react-native-uikit-colors" @@ -10,15 +9,19 @@ import { FileImportCuteReIcon } from "@/src/icons/file_import_cute_re" import { ListCheck2CuteReIcon } from "@/src/icons/list_check_2_cute_re" import { MingcuteRightLine } from "@/src/icons/mingcute_right_line" import { Settings1CuteReIcon } from "@/src/icons/settings_1_cute_re" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { SelectReadingModeScreen } from "@/src/screens/(modal)/onboarding/select-reading-mode" import { useWhoami } from "@/src/store/user/hooks" import { accentColor } from "@/src/theme/colors" +import { EditProfileScreen } from "../settings/routes/EditProfile" import { importOpml, setAvatar } from "../settings/utils" import { useReadingBehavior } from "./hooks/use-reading-behavior" export const StepPreferences = () => { const { behavior } = useReadingBehavior() + const navigation = useNavigation() return ( @@ -27,8 +30,8 @@ export const StepPreferences = () => { Personalize Your Experience - Set your preferences to make Follow work best for you. You can always change these later - in Settings. + Set your preferences to make Folo work best for you. You can always change these later in + Settings. @@ -41,7 +44,7 @@ export const StepPreferences = () => { } onPress={() => { - router.push("/onboarding/edit-profile") + navigation.pushControllerView(EditProfileScreen) }} > @@ -58,7 +61,7 @@ export const StepPreferences = () => { } onPress={() => { - router.push("/onboarding/select-reading-mode") + navigation.pushControllerView(SelectReadingModeScreen) }} > {behavior === "radical" && ( diff --git a/apps/mobile/src/modules/onboarding/step-welcome.tsx b/apps/mobile/src/modules/onboarding/step-welcome.tsx index 01af0007bd..bb8460487e 100644 --- a/apps/mobile/src/modules/onboarding/step-welcome.tsx +++ b/apps/mobile/src/modules/onboarding/step-welcome.tsx @@ -5,7 +5,7 @@ import { Logo } from "@/src/components/ui/logo" export const StepWelcome = () => ( - Welcome to Follow! + Welcome to Folo! This guide will help you get started with the app. diff --git a/apps/mobile/src/modules/player/PlayerTabBar.tsx b/apps/mobile/src/modules/player/PlayerTabBar.tsx index 697fa8a4ce..400270afe1 100644 --- a/apps/mobile/src/modules/player/PlayerTabBar.tsx +++ b/apps/mobile/src/modules/player/PlayerTabBar.tsx @@ -1,5 +1,4 @@ import { cn } from "@follow/utils" -import { router, usePathname } from "expo-router" import { useEffect } from "react" import { Pressable, Text, View } from "react-native" import Animated, { @@ -10,21 +9,25 @@ import Animated, { } from "react-native-reanimated" import { Image } from "@/src/components/ui/image/Image" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { useScreenName } from "@/src/lib/navigation/ScreenNameContext" import { useActiveTrack } from "@/src/lib/player" +import { PlayerScreen } from "@/src/screens/player" import { usePrefetchImageColors } from "@/src/store/image/hooks" import { PlayPauseButton, SeekButton } from "./control" -const allowedRoutes = new Set(["/", "/subscriptions", "/player"]) +const allowedScreenNames = new Set(["Home", "Subscriptions", "Player"]) export function PlayerTabBar({ className }: { className?: string }) { const activeTrack = useActiveTrack() - const pathname = usePathname() - const isVisible = !!activeTrack && allowedRoutes.has(pathname) + const screenName = useScreenName() + + const isVisible = !!activeTrack && allowedScreenNames.has(screenName) const isVisibleSV = useSharedValue(isVisible ? 1 : 0) useEffect(() => { isVisibleSV.value = withTiming(isVisible ? 1 : 0) - }, [pathname, isVisible]) + }, [isVisible, isVisibleSV]) const animatedStyle = useAnimatedStyle(() => { return { opacity: isVisibleSV.value, @@ -34,6 +37,7 @@ export function PlayerTabBar({ className }: { className?: string }) { }) usePrefetchImageColors(activeTrack?.artwork) + const navigation = useNavigation() return ( { - router.push("/player") + navigation.presentControllerView(PlayerScreen, void 0, "transparentModal") + // TODO }} > diff --git a/apps/mobile/src/modules/player/control.tsx b/apps/mobile/src/modules/player/control.tsx index eed9c65df4..d72f998d31 100644 --- a/apps/mobile/src/modules/player/control.tsx +++ b/apps/mobile/src/modules/player/control.tsx @@ -1,5 +1,4 @@ import { cn } from "@follow/utils" -import { router } from "expo-router" import { StyleSheet, Text, TouchableOpacity, View } from "react-native" import { Slider } from "react-native-awesome-slider" import { FadeOut, useDerivedValue, useSharedValue, ZoomIn } from "react-native-reanimated" @@ -15,6 +14,7 @@ import { RewindForward30CuteReIcon } from "@/src/icons/rewind_forward_30_cute_re import { StopCircleCuteFiIcon } from "@/src/icons/stop_circle_cute_fi" import { VolumeCuteReIcon } from "@/src/icons/volume_cute_re" import { VolumeOffCuteReIcon } from "@/src/icons/volume_off_cute_re" +import { useNavigation } from "@/src/lib/navigation/hooks" import { allowedRate, player, useIsPlaying, useProgress, useRate } from "@/src/lib/player" import { useVolume } from "@/src/lib/volume" import { useColor } from "@/src/theme/colors" @@ -113,12 +113,13 @@ export function RateSelector() { export function StopButton({ size = 24, className, color }: ControlButtonProps) { const label = useColor("label") + const navigation = useNavigation() return ( { player.reset() - router.back() + navigation.back() }} > diff --git a/apps/mobile/src/modules/screen/PageList.tsx b/apps/mobile/src/modules/screen/PageList.tsx new file mode 100644 index 0000000000..81c1672256 --- /dev/null +++ b/apps/mobile/src/modules/screen/PageList.tsx @@ -0,0 +1,75 @@ +import type { FeedViewType } from "@follow/constants" +import * as Haptics from "expo-haptics" +import { useEffect, useMemo } from "react" +import type { StyleProp, ViewStyle } from "react-native" +import { Animated, StyleSheet } from "react-native" +import PagerView from "react-native-pager-view" + +import { selectTimeline, useSelectedFeed } from "@/src/modules/screen/atoms" +import { useViewWithSubscription } from "@/src/store/subscription/hooks" + +import { setHorizontalScrolling } from "./atoms" +import { usePagerView } from "./usePagerView" + +const AnimatedPagerView = Animated.createAnimatedComponent(PagerView) + +export function PagerList({ + renderItem, + style, +}: { + renderItem: (view: FeedViewType, active: boolean) => React.ReactNode + style?: StyleProp | undefined +}) { + const selectedFeed = useSelectedFeed() + const viewId = selectedFeed?.type === "view" ? selectedFeed.viewId : undefined + + const activeViews = useViewWithSubscription() + const viewIdIndex = activeViews.findIndex((view) => view.view === viewId) + const { page, pagerRef, ...rest } = usePagerView({ + initialPage: viewIdIndex, + onIndexChange: (index) => { + selectTimeline({ type: "view", viewId: activeViews[index]!.view }) + }, + }) + + useEffect(() => { + if (page === viewIdIndex) return + pagerRef.current?.setPage(viewIdIndex) + }, [page, pagerRef, viewIdIndex]) + + return ( + { + rest.onPageScrollStateChanged(e) + setHorizontalScrolling(e.nativeEvent.pageScrollState !== "idle") + if (e.nativeEvent.pageScrollState === "settling") { + Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light) + } + }} + pageMargin={10} + orientation="horizontal" + > + {useMemo( + () => activeViews.map((view, index) => renderItem(view.view, page === index)), + [activeViews, page, renderItem], + )} + + ) +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + }, + PagerView: { + flex: 1, + }, +}) diff --git a/apps/mobile/src/modules/screen/TimelineSelectorList.tsx b/apps/mobile/src/modules/screen/TimelineSelectorList.tsx index b97660f905..bda416861a 100644 --- a/apps/mobile/src/modules/screen/TimelineSelectorList.tsx +++ b/apps/mobile/src/modules/screen/TimelineSelectorList.tsx @@ -1,9 +1,11 @@ +import { useTypeScriptHappyCallback } from "@follow/hooks" import type { FlashListProps, MasonryFlashListProps, MasonryFlashListRef, } from "@shopify/flash-list" import { FlashList, MasonryFlashList } from "@shopify/flash-list" +import * as Haptics from "expo-haptics" import type { ElementRef, RefObject } from "react" import { forwardRef, useCallback, useContext } from "react" import type { NativeScrollEvent, NativeSyntheticEvent } from "react-native" @@ -12,7 +14,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context" import { useColor } from "react-native-uikit-colors" import { useBottomTabBarHeight } from "@/src/components/layouts/tabbar/hooks" -import { NavigationContext } from "@/src/components/layouts/views/NavigationContext" +import { ScreenItemContext } from "@/src/lib/navigation/ScreenItemContext" import { useHeaderHeight } from "@/src/modules/screen/hooks/useHeaderHeight" import { usePrefetchSubscription } from "@/src/store/subscription/hooks" import { usePrefetchUnread } from "@/src/store/unread/hooks" @@ -30,30 +32,39 @@ export const TimelineSelectorList = forwardRef< const { refetch: subscriptionRefetch } = usePrefetchSubscription() const headerHeight = useHeaderHeight() - const { scrollY } = useContext(NavigationContext)! + const { reAnimatedScrollY, scrollViewHeight, scrollViewContentHeight } = + useContext(ScreenItemContext)! const onScroll = useCallback( (e: NativeSyntheticEvent) => { props.onScroll?.(e) - scrollY?.setValue(e.nativeEvent.contentOffset.y) + reAnimatedScrollY.value = e.nativeEvent.contentOffset.y }, - [scrollY, props.onScroll], + [props, reAnimatedScrollY], ) const tabBarHeight = useBottomTabBarHeight() const systemFill = useColor("secondaryLabel") - // const listRef = useRef>(null) - - // useImperativeHandle(ref, () => listRef.current!) - return ( { + scrollViewHeight.value = e.nativeEvent.layout.height - headerHeight - tabBarHeight + }, + [scrollViewHeight], + )} + onContentSizeChange={useTypeScriptHappyCallback( + (w, h) => { + scrollViewContentHeight.value = h + }, + [scrollViewContentHeight], + )} refreshControl={ { unreadRefetch() subscriptionRefetch() + Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light) onRefresh() }} refreshing={isRefetching} @@ -91,14 +103,15 @@ export const TimelineSelectorMasonryList = forwardRef< const insets = useSafeAreaInsets() const headerHeight = useHeaderHeight() - const scrollY = useContext(NavigationContext)?.scrollY + + const { reAnimatedScrollY } = useContext(ScreenItemContext)! const onScroll = useCallback( (e: NativeSyntheticEvent) => { props.onScroll?.(e) - scrollY?.setValue(e.nativeEvent.contentOffset.y) + reAnimatedScrollY.value = e.nativeEvent.contentOffset.y }, - [scrollY, props.onScroll], + [props, reAnimatedScrollY], ) const tabBarHeight = useBottomTabBarHeight() diff --git a/apps/mobile/src/modules/screen/TimelineSelectorProvider.tsx b/apps/mobile/src/modules/screen/TimelineSelectorProvider.tsx index ac8527d131..81a2329299 100644 --- a/apps/mobile/src/modules/screen/TimelineSelectorProvider.tsx +++ b/apps/mobile/src/modules/screen/TimelineSelectorProvider.tsx @@ -1,16 +1,15 @@ import { env } from "@follow/shared/src/env" -import { useLocalSearchParams } from "expo-router" import { useMemo } from "react" -import { Share, useAnimatedValue, View } from "react-native" +import { Share, View } from "react-native" import { useColor } from "react-native-uikit-colors" import { DefaultHeaderBackButton } from "@/src/components/layouts/header/NavigationHeader" -import { NavigationContext } from "@/src/components/layouts/views/NavigationContext" import { NavigationBlurEffectHeader } from "@/src/components/layouts/views/SafeNavigationScrollView" import { UIBarButton } from "@/src/components/ui/button/UIBarButton" import { TIMELINE_VIEW_SELECTOR_HEIGHT } from "@/src/constants/ui" import { Share3CuteReIcon } from "@/src/icons/share_3_cute_re" import { + ActionGroup, HomeLeftAction, HomeSharedRightAction, UnreadOnlyActionButton, @@ -20,24 +19,29 @@ import { getFeed } from "@/src/store/feed/getter" import { useEntryListContext, useSelectedFeedTitle } from "./atoms" -export function TimelineSelectorProvider({ children }: { children: React.ReactNode }) { - const scrollY = useAnimatedValue(0) +export function TimelineSelectorProvider({ + children, + feedId, +}: { + children: React.ReactNode + feedId?: string +}) { const viewTitle = useSelectedFeedTitle() const screenType = useEntryListContext().type - const params = useLocalSearchParams() + const isFeed = screenType === "feed" const isTimeline = screenType === "timeline" const isSubscriptions = screenType === "subscriptions" + return ( - ({ scrollY }), [scrollY])}> + <> isTimeline || isSubscriptions ? () => - : () => , + : () => , [isTimeline, isSubscriptions], )} headerRight={useMemo(() => { @@ -52,28 +56,27 @@ export function TimelineSelectorProvider({ children }: { children: React.ReactNo if (isSubscriptions) return () => if (isFeed) return () => ( - + - - + + ) })() if (Component) return () => {Component()} return - }, [isFeed, isTimeline, isSubscriptions, params])} + }, [isFeed, isTimeline, isSubscriptions, feedId])} headerHideableBottom={isTimeline || isSubscriptions ? TimelineViewSelector : undefined} headerHideableBottomHeight={TIMELINE_VIEW_SELECTOR_HEIGHT} /> {children} - + ) } -function FeedShareAction({ params }: { params: any }) { +function FeedShareAction({ feedId }: { feedId?: string }) { const label = useColor("label") - const { feedId } = params if (!feedId) return null return ( @@ -85,7 +88,7 @@ function FeedShareAction({ params }: { params: any }) { if (!feed) return const url = `${env.VITE_WEB_URL}/share/feeds/${feedId}` Share.share({ - message: `Check out ${feed.title} on Follow: ${url}`, + message: `Check out ${feed.title} on Folo: ${url}`, title: feed.title!, url, }) diff --git a/apps/mobile/src/modules/screen/action.tsx b/apps/mobile/src/modules/screen/action.tsx index 943cdf8dfc..0848acc3e9 100644 --- a/apps/mobile/src/modules/screen/action.tsx +++ b/apps/mobile/src/modules/screen/action.tsx @@ -1,5 +1,5 @@ import { cn } from "@follow/utils" -import { router } from "expo-router" +import * as Haptics from "expo-haptics" import type { PropsWithChildren } from "react" import { useCallback } from "react" import { TouchableOpacity, View } from "react-native" @@ -12,27 +12,31 @@ import { CheckCircleCuteReIcon } from "@/src/icons/check_circle_cute_re" import { RoundCuteFiIcon } from "@/src/icons/round_cute_fi" import { RoundCuteReIcon } from "@/src/icons/round_cute_re" import { Dialog } from "@/src/lib/dialog" +import { useNavigation } from "@/src/lib/navigation/hooks" import { toast } from "@/src/lib/toast" +import { LoginScreen } from "@/src/screens/(modal)/login" +import { ProfileScreen } from "@/src/screens/(modal)/profile" import { useWhoami } from "@/src/store/user/hooks" import { accentColor, useColor } from "@/src/theme/colors" import { AddFeedDialog } from "../dialogs/AddFeedDialog" import { MarkAllAsReadDialog } from "../dialogs/MarkAllAsReadDialog" -const ActionGroup = ({ children, className }: PropsWithChildren<{ className?: string }>) => { +export const ActionGroup = ({ children, className }: PropsWithChildren<{ className?: string }>) => { return {children} } export function HomeLeftAction() { const user = useWhoami() + const navigation = useNavigation() const handlePress = useCallback(() => { if (user) { - router.push("/profile") + navigation.presentControllerView(ProfileScreen, { userId: user.id }) } else { - router.push("/login") + navigation.presentControllerView(LoginScreen) } - }, [user]) + }, [navigation, user]) return ( @@ -42,7 +46,7 @@ export function HomeLeftAction() { name={user?.name} className="rounded-full" color={accentColor} - noPreview + preview={false} /> @@ -84,8 +88,9 @@ export const UnreadOnlyActionButton = ({ variant = "primary" }: HeaderActionButt normalIcon={} selectedIcon={} onPress={() => { + Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light) setGeneralSetting("unreadOnly", !unreadOnly) - toast.info(`Showing ${unreadOnly ? "all" : "unread"} entries`, { position: "bottom" }) + toast.success(`Showing ${unreadOnly ? "all" : "unread"} entries`, { position: "bottom" }) }} selected={unreadOnly} overlay={false} @@ -95,14 +100,12 @@ export const UnreadOnlyActionButton = ({ variant = "primary" }: HeaderActionButt export const AddFeedButton = () => { return ( - <> - } - onPress={() => { - Dialog.show(AddFeedDialog) - }} - /> - + } + onPress={() => { + Dialog.show(AddFeedDialog) + }} + /> ) } diff --git a/apps/mobile/src/modules/screen/atoms.ts b/apps/mobile/src/modules/screen/atoms.ts index 28bc23bb56..8c840ecaea 100644 --- a/apps/mobile/src/modules/screen/atoms.ts +++ b/apps/mobile/src/modules/screen/atoms.ts @@ -126,6 +126,7 @@ export function useSelectedView() { function getFetchEntryPayload( selectedFeed: SelectedTimeline | SelectedFeed, + view: FeedViewType = FeedViewType.Articles, ): FetchEntriesProps | null { if (!selectedFeed) { return null @@ -158,6 +159,7 @@ function getFetchEntryPayload( const isCollection = selectedFeed && selectedFeed.type === "feed" && selectedFeed?.feedId === FEED_COLLECTION_LIST if (isCollection) { + payload.view = view payload.isCollection = true } @@ -174,8 +176,9 @@ export function useSelectedFeed() { export function useFetchEntriesControls() { const selectedFeed = useSelectedFeed() + const view = useSelectedView() - const payload = getFetchEntryPayload(selectedFeed) + const payload = getFetchEntryPayload(selectedFeed, view) return usePrefetchEntries(payload) } @@ -224,3 +227,12 @@ export const useViewDefinition = (view?: FeedViewType) => { const viewDef = useMemo(() => views.find((v) => v.view === view), [view]) return viewDef } + +// horizontal scrolling state + +const horizontalScrollingAtom = atom(false) + +export const setHorizontalScrolling = (value: boolean) => + jotaiStore.set(horizontalScrollingAtom, value) + +export const getHorizontalScrolling = () => jotaiStore.get(horizontalScrollingAtom) diff --git a/apps/mobile/src/modules/entry-list/usePagerView.ts b/apps/mobile/src/modules/screen/usePagerView.ts similarity index 100% rename from apps/mobile/src/modules/entry-list/usePagerView.ts rename to apps/mobile/src/modules/screen/usePagerView.ts diff --git a/apps/mobile/src/modules/settings/SettingsList.tsx b/apps/mobile/src/modules/settings/SettingsList.tsx index 29e0c872e0..f5f5ec6e29 100644 --- a/apps/mobile/src/modules/settings/SettingsList.tsx +++ b/apps/mobile/src/modules/settings/SettingsList.tsx @@ -1,13 +1,9 @@ -import { useIsFocused } from "@react-navigation/native" import * as FileSystem from "expo-file-system" import type { FC, RefObject } from "react" -import { Fragment, useContext, useEffect, useMemo } from "react" +import { Fragment, useMemo } from "react" import type { ScrollView } from "react-native" -import { Alert, View } from "react-native" -import { useSafeAreaInsets } from "react-native-safe-area-context" +import { Alert, PixelRatio, View } from "react-native" -import { SetBottomTabBarVisibleContext } from "@/src/components/layouts/tabbar/contexts/BottomTabBarVisibleContext" -import { useBottomTabBarHeight } from "@/src/components/layouts/tabbar/hooks" import { GroupedInsetListCard, GroupedInsetListNavigationLink, @@ -26,17 +22,25 @@ import { Settings1CuteFiIcon } from "@/src/icons/settings_1_cute_fi" import { StarCuteFiIcon } from "@/src/icons/star_cute_fi" import { UserSettingCuteFiIcon } from "@/src/icons/user_setting_cute_fi" import { signOut } from "@/src/lib/auth" +import { useNavigation } from "@/src/lib/navigation/hooks" +import type { Navigation } from "@/src/lib/navigation/Navigation" import { useWhoami } from "@/src/store/user/hooks" -import { useSettingsNavigation } from "./hooks" +import { AboutScreen } from "./routes/About" +import { AccountScreen } from "./routes/Account" +import { ActionsScreen } from "./routes/Actions" +import { AppearanceScreen } from "./routes/Appearance" +import { DataScreen } from "./routes/Data" +import { FeedsScreen } from "./routes/Feeds" +import { GeneralScreen } from "./routes/General" +import { ListsScreen } from "./routes/Lists" +import { NotificationsScreen } from "./routes/Notifications" +import { PrivacyScreen } from "./routes/Privacy" interface GroupNavigationLink { label: string icon: React.ElementType - onPress: ( - navigation: ReturnType, - scrollRef: RefObject, - ) => void + onPress: (navigation: Navigation, scrollRef: RefObject) => void iconBackgroundColor: string anonymous?: boolean @@ -47,7 +51,7 @@ const SettingGroupNavigationLinks: GroupNavigationLink[] = [ label: "General", icon: Settings1CuteFiIcon, onPress: (navigation) => { - navigation.navigate("General") + navigation.pushControllerView(GeneralScreen) }, iconBackgroundColor: "#F59E0B", }, @@ -55,7 +59,7 @@ const SettingGroupNavigationLinks: GroupNavigationLink[] = [ label: "Notifications", icon: BellRingingCuteFiIcon, onPress: (navigation) => { - navigation.navigate("Notifications") + navigation.pushControllerView(NotificationsScreen) }, iconBackgroundColor: "#FBBF24", todo: true, @@ -65,7 +69,7 @@ const SettingGroupNavigationLinks: GroupNavigationLink[] = [ label: "Appearance", icon: PaletteCuteFiIcon, onPress: (navigation) => { - navigation.navigate("Appearance") + navigation.pushControllerView(AppearanceScreen) }, iconBackgroundColor: "#FCD34D", }, @@ -73,7 +77,7 @@ const SettingGroupNavigationLinks: GroupNavigationLink[] = [ label: "Data", icon: DatabaseIcon, onPress: (navigation) => { - navigation.navigate("Data") + navigation.pushControllerView(DataScreen) }, iconBackgroundColor: "#CBAD6D", anonymous: false, @@ -82,7 +86,7 @@ const SettingGroupNavigationLinks: GroupNavigationLink[] = [ label: "Account", icon: UserSettingCuteFiIcon, onPress: (navigation) => { - navigation.navigate("Account") + navigation.pushControllerView(AccountScreen) }, iconBackgroundColor: "#d08700", anonymous: false, @@ -94,7 +98,7 @@ const DataGroupNavigationLinks: GroupNavigationLink[] = [ label: "Actions", icon: Magic2CuteFiIcon, onPress: (navigation) => { - navigation.navigate("Actions") + navigation.pushControllerView(ActionsScreen) }, iconBackgroundColor: "#059669", anonymous: false, @@ -104,7 +108,7 @@ const DataGroupNavigationLinks: GroupNavigationLink[] = [ label: "Feeds", icon: CertificateCuteFiIcon, onPress: (navigation) => { - navigation.navigate("Feeds") + navigation.pushControllerView(FeedsScreen) }, iconBackgroundColor: "#10B981", todo: true, @@ -114,7 +118,7 @@ const DataGroupNavigationLinks: GroupNavigationLink[] = [ label: "Lists", icon: RadaCuteFiIcon, onPress: (navigation) => { - navigation.navigate("Lists") + navigation.pushControllerView(ListsScreen) }, iconBackgroundColor: "#34D399", // todo: true, @@ -127,7 +131,7 @@ const PrivacyGroupNavigationLinks: GroupNavigationLink[] = [ label: "Privacy", icon: SafeLockFilledIcon, onPress: (navigation) => { - navigation.navigate("Privacy") + navigation.pushControllerView(PrivacyScreen) }, iconBackgroundColor: "#EF4444", }, @@ -135,7 +139,7 @@ const PrivacyGroupNavigationLinks: GroupNavigationLink[] = [ label: "About", icon: StarCuteFiIcon, onPress: (navigation) => { - navigation.navigate("About") + navigation.pushControllerView(AboutScreen) }, iconBackgroundColor: "#F87181", }, @@ -168,31 +172,33 @@ const ActionGroupNavigationLinks: GroupNavigationLink[] = [ const NavigationLinkGroup: FC<{ links: GroupNavigationLink[] - navigation: ReturnType scrollRef: RefObject -}> = ({ links, navigation, scrollRef }) => ( - - {links.map((link) => { - if (link.todo) { - return null - } - return ( - - - - } - onPress={() => { - link.onPress(navigation, scrollRef) - }} - /> - ) - })} - -) +}> = ({ links, scrollRef }) => { + const navigation = useNavigation() + + return ( + + {links + .filter((link) => !link.todo) + .map((link) => { + return ( + + + + } + onPress={() => { + link.onPress(navigation, scrollRef) + }} + /> + ) + })} + + ) +} const navigationGroups = [ DataGroupNavigationLinks, @@ -202,19 +208,6 @@ const navigationGroups = [ ] as const export const SettingsList: FC<{ scrollRef: RefObject }> = ({ scrollRef }) => { - const navigation = useSettingsNavigation() - - const setTabBarVisible = useContext(SetBottomTabBarVisibleContext) - const isVisible = useIsFocused() - useEffect(() => { - if (isVisible) { - setTabBarVisible(true) - } - }, [isVisible, setTabBarVisible]) - - const insets = useSafeAreaInsets() - const tabBarHeight = useBottomTabBarHeight() - const whoami = useWhoami() const filteredNavigationGroups = useMemo(() => { @@ -228,20 +221,17 @@ export const SettingsList: FC<{ scrollRef: RefObject }> = ({ scrollR }) .filter((group) => group !== false) }, [whoami]) + + const pixelRatio = PixelRatio.get() + const groupGap = 100 / pixelRatio + const marginTop = 44 / pixelRatio + return ( - + {filteredNavigationGroups.map((group, index) => ( - - {index < filteredNavigationGroups.length - 1 && } + + {index < filteredNavigationGroups.length - 1 && } ))} diff --git a/apps/mobile/src/modules/settings/UserHeaderBanner.tsx b/apps/mobile/src/modules/settings/UserHeaderBanner.tsx index ca10cf11ab..5a948e2691 100644 --- a/apps/mobile/src/modules/settings/UserHeaderBanner.tsx +++ b/apps/mobile/src/modules/settings/UserHeaderBanner.tsx @@ -1,6 +1,5 @@ import { cn, getLuminance } from "@follow/utils" import { LinearGradient } from "expo-linear-gradient" -import { router } from "expo-router" import { useMemo } from "react" import { StyleSheet, Text, TouchableOpacity, View } from "react-native" import type { SharedValue } from "react-native-reanimated" @@ -9,6 +8,8 @@ import { useSafeAreaInsets } from "react-native-safe-area-context" import { useColor } from "react-native-uikit-colors" import { UserAvatar } from "@/src/components/ui/avatar/UserAvatar" +import { useNavigation } from "@/src/lib/navigation/hooks" +import { LoginScreen } from "@/src/screens/(modal)/login" import { useImageColors, usePrefetchImageColors } from "@/src/store/image/hooks" import { useUser } from "@/src/store/user/hooks" @@ -87,6 +88,8 @@ export const UserHeaderBanner = ({ } }) + const navigation = useNavigation() + return ( ) : ( - Follow Account + Folo Account )} {user?.handle ? ( @@ -147,7 +150,10 @@ export const UserHeaderBanner = ({ @{user.handle} ) : !user ? ( - router.push("/login")}> + navigation.presentControllerView(LoginScreen)} + > Sign in to your account ) : null} diff --git a/apps/mobile/src/modules/settings/actions/components.tsx b/apps/mobile/src/modules/settings/actions/components.tsx deleted file mode 100644 index d2f486e489..0000000000 --- a/apps/mobile/src/modules/settings/actions/components.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import { Text } from "react-native" -import * as DropdownMenu from "zeego/dropdown-menu" - -import { GroupedInsetListCell } from "@/src/components/ui/grouped/GroupedList" -import { actionActions } from "@/src/store/action/store" -import type { ActionRule } from "@/src/store/action/types" - -import { translationOptions } from "./constant" - -export const ActionFormTranslation: React.FC<{ rule: ActionRule }> = ({ rule }) => { - const currentTranslation = translationOptions.find( - (translation) => translation.value === rule.result?.translation, - ) - return ( - - - - {currentTranslation?.label || "Select"} - - - {translationOptions.map((translation) => ( - { - actionActions.patchRule(rule.index, { result: { translation: translation.value } }) - }} - > - {translation.label} - - ))} - - - - ) -} diff --git a/apps/mobile/src/modules/settings/actions/constant.ts b/apps/mobile/src/modules/settings/actions/constant.ts index 441cfdd154..b477a78b0f 100644 --- a/apps/mobile/src/modules/settings/actions/constant.ts +++ b/apps/mobile/src/modules/settings/actions/constant.ts @@ -1,9 +1,10 @@ import type { SupportedLanguages } from "@/src/lib/language" +import type { Navigation } from "@/src/lib/navigation/Navigation" import { actionActions } from "@/src/store/action/store" import type { ActionId, ActionRule } from "@/src/store/action/types" -import type { SettingsNavigation } from "../hooks" -import { ActionFormTranslation } from "./components" +import { EditRewriteRulesScreen } from "../routes/EditRewriteRules" +import { EditWebhooksScreen } from "../routes/EditWebhooks" export const filterFieldOptions = [ { @@ -92,7 +93,7 @@ export const availableActionList: Array<{ value: ActionId label: string onEnable?: (index: number) => void - onNavigate?: (router: SettingsNavigation, index: number) => void + onNavigate?: (router: Navigation, index: number) => void component?: React.FC<{ rule: ActionRule }> }> = [ { @@ -102,10 +103,6 @@ export const availableActionList: Array<{ { value: "translation", label: "Translate into", - onEnable: (index) => { - actionActions.patchRule(index, { result: { translation: "zh-CN" } }) - }, - component: ActionFormTranslation, }, { value: "readability", @@ -143,7 +140,7 @@ export const availableActionList: Array<{ }) }, onNavigate: (router, index) => { - router.navigate("EditRewriteRules", { index }) + router.pushControllerView(EditRewriteRulesScreen, { index }) }, }, { @@ -153,7 +150,7 @@ export const availableActionList: Array<{ actionActions.patchRule(index, { result: { webhooks: [""] } }) }, onNavigate: (router, index) => { - router.navigate("EditWebhooks", { index }) + router.pushControllerView(EditWebhooksScreen, { index }) }, }, ] diff --git a/apps/mobile/src/modules/settings/hooks.ts b/apps/mobile/src/modules/settings/hooks.ts deleted file mode 100644 index 0b88f6f79a..0000000000 --- a/apps/mobile/src/modules/settings/hooks.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { useNavigation } from "@react-navigation/native" -import type { NativeStackNavigationProp } from "@react-navigation/native-stack" - -import type { SettingsStackParamList } from "./types" - -export const useSettingsNavigation = () => { - return useNavigation>() -} - -export type SettingsNavigation = ReturnType diff --git a/apps/mobile/src/modules/settings/routes/2FASetting.tsx b/apps/mobile/src/modules/settings/routes/2FASetting.tsx index 840a4892de..bdd1d9fea3 100644 --- a/apps/mobile/src/modules/settings/routes/2FASetting.tsx +++ b/apps/mobile/src/modules/settings/routes/2FASetting.tsx @@ -1,4 +1,3 @@ -import type { RouteProp } from "@react-navigation/native" import { useMutation } from "@tanstack/react-query" import { useRef } from "react" import { KeyboardAvoidingView, Text, View } from "react-native" @@ -11,26 +10,21 @@ import { } from "@/src/components/layouts/views/SafeNavigationScrollView" import { QRCode } from "@/src/components/ui/qrcode/QRCode" import { twoFactor } from "@/src/lib/auth" +import { useNavigation } from "@/src/lib/navigation/hooks" +import type { NavigationControllerView } from "@/src/lib/navigation/types" import { queryClient } from "@/src/lib/query-client" import { toast } from "@/src/lib/toast" import { whoamiQueryKey } from "@/src/store/user/hooks" import { accentColor, useColor } from "@/src/theme/colors" -import { useSettingsNavigation } from "../hooks" -import type { SettingsStackParamList } from "../types" - const isAuthCodeValid = (code: string) => { return code.length === 6 && Number(code) > 0 } -export const TwoFASetting = ({ - route, -}: { - route: RouteProp -}) => { +export const TwoFASetting: NavigationControllerView<{ totpURI: string }> = ({ totpURI }) => { const label = useColor("label") const tertiaryLabel = useColor("tertiaryLabel") - const navigation = useSettingsNavigation() + const navigation = useNavigation() const submitMutation = useMutation({ mutationFn: async (value: string) => { const res = await twoFactor.verifyTotp({ code: value }) @@ -43,7 +37,7 @@ export const TwoFASetting = ({ toast.error(`Failed to verify: ${error.message}`) }, onSuccess() { - navigation.goBack() + navigation.back() toast.success("2FA enabled!") }, }) @@ -56,7 +50,7 @@ export const TwoFASetting = ({ { const appVersion = Constants.expoConfig?.version || "0.0.0" return ( - + - Follow + Folo {appVersion} ({buildId}) - Follow is in the early stages of development. If you have any feedback or suggestions, + Folo is in the early stages of development. If you have any feedback or suggestions, please feel free to open an issue on the{" "} GitHub repository @@ -77,28 +77,27 @@ export const AboutScreen = () => { - Copyright © 2025 Follow. All rights reserved. + Copyright © 2025 Folo. All rights reserved. - - - - {links.map((link) => ( - - - - } - onPress={() => Linking.openURL(link.url)} - /> - ))} - - + + + + {links.map((link) => ( + + + + } + onPress={() => Linking.openURL(link.url)} + /> + ))} + ) } diff --git a/apps/mobile/src/modules/settings/routes/Account.tsx b/apps/mobile/src/modules/settings/routes/Account.tsx index 7c00bf2436..4fe48643a6 100644 --- a/apps/mobile/src/modules/settings/routes/Account.tsx +++ b/apps/mobile/src/modules/settings/routes/Account.tsx @@ -8,9 +8,9 @@ import { NavigationBlurEffectHeader, SafeNavigationScrollView, } from "@/src/components/layouts/views/SafeNavigationScrollView" +import { GroupedInsetListCardItemStyle } from "@/src/components/ui/grouped/GroupedInsetListCardItemStyle" import { GroupedInsetListCard, - GroupedInsetListCardItemStyle, GroupedInsetListNavigationLink, GroupedInsetListNavigationLinkIcon, GroupedInsetListSectionHeader, @@ -33,12 +33,14 @@ import { import { Dialog } from "@/src/lib/dialog" import { loading } from "@/src/lib/loading" import { openLink } from "@/src/lib/native" +import { useNavigation } from "@/src/lib/navigation/hooks" import { toast } from "@/src/lib/toast" import { useWhoami } from "@/src/store/user/hooks" import { userSyncService } from "@/src/store/user/store" import { ConfirmPasswordDialog } from "../../dialogs/ConfirmPasswordDialog" -import { useSettingsNavigation } from "../hooks" +import { TwoFASetting } from "./2FASetting" +import { ResetPassword } from "./ResetPassword" type Account = { id: string @@ -65,37 +67,34 @@ export const AccountScreen = () => { - - - + {/* Danger Zone */} - - - - { - Alert.alert("Delete account", "Are you sure you want to delete your account?", [ - { text: "Cancel", style: "cancel" }, - { - text: "Delete", - style: "destructive", - onPress: async () => { - await signOut() - const dbPath = getDbPath() - await FileSystem.deleteAsync(dbPath) - await expo.reloadAppAsync("User sign out") - }, + + + + { + Alert.alert("Delete account", "Are you sure you want to delete your account?", [ + { text: "Cancel", style: "cancel" }, + { + text: "Delete", + style: "destructive", + onPress: async () => { + await signOut() + const dbPath = getDbPath() + await FileSystem.deleteAsync(dbPath) + await expo.reloadAppAsync("User sign out") }, - ]) - }} - /> - - + }, + ]) + }} + /> + ) } @@ -232,13 +231,13 @@ const AuthenticationSection = () => { const SecuritySection = () => { const { data: account } = useAccount() const hasPassword = account?.data?.find((account) => account.provider === "credential") - const router = useSettingsNavigation() const whoAmI = useWhoami() const twoFactorEnabled = whoAmI?.twoFactorEnabled + const navigation = useNavigation() return ( - + <> { forgetPassword({ email }) toast.success("We have sent you an email with instructions to reset your password.") } else { - router.navigate("ResetPassword") + navigation.pushControllerView(ResetPassword) } }} /> @@ -292,7 +291,7 @@ const SecuritySection = () => { return } if (res.data && "totpURI" in res.data) { - router.navigate("TwoFASetting", { + navigation.pushControllerView(TwoFASetting, { totpURI: res.data.totpURI, }) } else { @@ -304,6 +303,6 @@ const SecuritySection = () => { }} /> - + ) } diff --git a/apps/mobile/src/modules/settings/routes/Actions.tsx b/apps/mobile/src/modules/settings/routes/Actions.tsx index 83e84dfa05..3602ed48e8 100644 --- a/apps/mobile/src/modules/settings/routes/Actions.tsx +++ b/apps/mobile/src/modules/settings/routes/Actions.tsx @@ -3,7 +3,7 @@ import { useCallback } from "react" import type { ListRenderItem } from "react-native" import { ActivityIndicator, Text, View } from "react-native" import Animated, { LinearTransition } from "react-native-reanimated" -import { useColor } from "react-native-uikit-colors" +import { useColor, useColors } from "react-native-uikit-colors" import { RotateableLoading } from "@/src/components/common/RotateableLoading" import { SwipeableGroupProvider, SwipeableItem } from "@/src/components/common/SwipeableItem" @@ -21,6 +21,7 @@ import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable" import { Switch } from "@/src/components/ui/switch/Switch" import { CheckLineIcon } from "@/src/icons/check_line" import { Magic2CuteFiIcon } from "@/src/icons/magic_2_cute_fi" +import { useNavigation } from "@/src/lib/navigation/hooks" import { useActionRules, useIsActionDataDirty, @@ -30,7 +31,7 @@ import { import { actionActions } from "@/src/store/action/store" import type { ActionRule } from "@/src/store/action/types" -import { useSettingsNavigation } from "../hooks" +import { EditRuleScreen } from "./EditRule" export const ActionsScreen = () => { const { isLoading } = usePrefetchActions() @@ -115,7 +116,7 @@ const SaveRuleButton = ({ disabled }: { disabled?: boolean }) => { const ItemSeparatorComponent = () => { return ( @@ -127,7 +128,9 @@ const ListItemCell: ListRenderItem = (props) => { return } const ListItemCellImpl: ListRenderItem = ({ item: rule }) => { - const navigation = useSettingsNavigation() + const navigation = useNavigation() + const colors = useColors() + return ( = ({ item: rule }) => { onPress: () => { actionActions.deleteRule(rule.index) }, - backgroundColor: "red", + backgroundColor: colors.red, }, { label: "Edit", onPress: () => { - navigation.navigate("EditRule", { index: rule.index }) + navigation.pushControllerView(EditRuleScreen, { + index: rule.index, + }) }, - backgroundColor: "#0ea5e9", + backgroundColor: colors.blue, }, ]} > navigation.navigate("EditRule", { index: rule.index })} + onPress={() => navigation.presentControllerView(EditRuleScreen, { index: rule.index })} > {rule.name} { return ( - - - - - { - setUISetting("subscriptionShowUnreadCount", val) - }} - /> - - - + + + { + setUISetting("subscriptionShowUnreadCount", val) + }} + /> + + + + { + setUISetting("hideExtraBadge", val) + }} + /> + + + + { - setUISetting("thumbnailRatio", val as "square" | "original") - }} - /> - - - + + + - - - - - ({ + label: theme, + value: theme, + }))} + value={colorScheme === "dark" ? codeThemeDark : codeThemeLight} + onValueChange={(val) => { + setUISetting(`codeHighlightTheme${colorScheme === "dark" ? "Dark" : "Light"}`, val) + }} + /> + - - { - setUISetting("readerRenderInlineStyle", val) - }} - /> - + + { + setUISetting("readerRenderInlineStyle", val) + }} + /> + - - { - setUISetting("hideRecentReader", val) - }} - /> - - - - + + { + setUISetting("hideRecentReader", val) + }} + /> + + ) } diff --git a/apps/mobile/src/modules/settings/routes/Data.tsx b/apps/mobile/src/modules/settings/routes/Data.tsx index 2f4333e503..bdfa1a4912 100644 --- a/apps/mobile/src/modules/settings/routes/Data.tsx +++ b/apps/mobile/src/modules/settings/routes/Data.tsx @@ -1,5 +1,5 @@ import * as FileSystem from "expo-file-system" -import { Alert, View } from "react-native" +import { Alert } from "react-native" import { setDataSetting, useDataSettingKey } from "@/src/atoms/settings/data" import { @@ -23,93 +23,89 @@ export const DataScreen = () => { return ( - - - - - { - setDataSetting("sendAnonymousData", val) - }} - /> - - - + + + + + { + setDataSetting("sendAnonymousData", val) + }} + /> + + {/* Data Sources */} - - - - - - - + + + + + + {/* Utils */} - - + - - { - Alert.alert( - "Rebuild database?", - "This will delete all your offline cached data and rebuild the database, and after that the app will reload.", - [ - { - text: "Cancel", - style: "cancel", - }, - { - text: "Rebuild", - style: "destructive", - onPress: async () => { - const dbPath = getDbPath() - await FileSystem.deleteAsync(dbPath) - await expo.reloadAppAsync("Clear Sqlite Data") - }, - }, - ], - ) - }} - label="Rebuild database" - description="If you are experiencing rendering issues, rebuilding the database may solve them." - /> - - { - Alert.alert("Clear cache?", "This will clear all temporary files and cached data.", [ + + { + Alert.alert( + "Rebuild database?", + "This will delete all your offline cached data and rebuild the database, and after that the app will reload.", + [ { text: "Cancel", style: "cancel", }, { - text: "Clear", - - isPreferred: true, + text: "Rebuild", + style: "destructive", onPress: async () => { - const cacheDir = FileSystem.cacheDirectory - if (cacheDir) { - await FileSystem.deleteAsync(cacheDir, { idempotent: true }) - } - toast.success("Cache cleared") + const dbPath = getDbPath() + await FileSystem.deleteAsync(dbPath) + await expo.reloadAppAsync("Clear Sqlite Data") }, }, - ]) - }} - label="Clear cache" - description="Clear temporary files and cached data to free up storage space." - /> - - + ], + ) + }} + label="Rebuild database" + description="If you are experiencing rendering issues, rebuilding the database may solve them." + /> + + { + Alert.alert("Clear cache?", "This will clear all temporary files and cached data.", [ + { + text: "Cancel", + style: "cancel", + }, + { + text: "Clear", + + isPreferred: true, + onPress: async () => { + const cacheDir = FileSystem.cacheDirectory + if (cacheDir) { + await FileSystem.deleteAsync(cacheDir, { idempotent: true }) + } + toast.success("Cache cleared") + }, + }, + ]) + }} + label="Clear cache" + description="Clear temporary files and cached data to free up storage space." + /> + ) } diff --git a/apps/mobile/src/modules/settings/routes/EditCondition.tsx b/apps/mobile/src/modules/settings/routes/EditCondition.tsx index 8f1fd628fc..2eb7e55c83 100644 --- a/apps/mobile/src/modules/settings/routes/EditCondition.tsx +++ b/apps/mobile/src/modules/settings/routes/EditCondition.tsx @@ -1,9 +1,8 @@ -import type { RouteProp } from "@react-navigation/native" import { Text, View } from "react-native" -import * as DropdownMenu from "zeego/dropdown-menu" -import { ModalHeader } from "@/src/components/layouts/header/ModalHeader" import { SafeModalScrollView } from "@/src/components/layouts/views/SafeModalScrollView" +import { NavigationBlurEffectHeader } from "@/src/components/layouts/views/SafeNavigationScrollView" +import { Select } from "@/src/components/ui/form/Select" import { PlainTextField } from "@/src/components/ui/form/TextField" import { GroupedInsetListBaseCell, @@ -11,24 +10,24 @@ import { GroupedInsetListSectionHeader, } from "@/src/components/ui/grouped/GroupedList" import { views } from "@/src/constants/views" +import type { NavigationControllerView } from "@/src/lib/navigation/types" import { useActionRuleCondition } from "@/src/store/action/hooks" import { actionActions } from "@/src/store/action/store" import type { ConditionIndex } from "@/src/store/action/types" import { accentColor } from "@/src/theme/colors" import { filterFieldOptions, filterOperatorOptions } from "../actions/constant" -import type { SettingsStackParamList } from "../types" -export function EditConditionScreen({ - route, -}: { - route: RouteProp -}) { +export const EditConditionScreen: NavigationControllerView<{ + ruleIndex: number + groupIndex: number + conditionIndex: number +}> = (params) => { return ( - + - + ) } @@ -43,89 +42,53 @@ function ConditionForm({ index }: { index: ConditionIndex }) { : undefined return ( - + <> Field - - - {currentField?.label || "Select"} - - - {filterFieldOptions.map((field) => ( - { - actionActions.pathCondition(index, { - field: field.value as any, - }) - }} - > - {field.label} - - ))} - - + + operator.types.includes(currentField?.type ?? "text"), + )} + value={currentOperator?.value} + onValueChange={(value) => { + actionActions.pathCondition(index, { + operator: value as any, + }) + }} + wrapperClassName="min-w-44" + /> Value {currentField?.type === "view" ? ( - - - - {currentView?.icon({ - height: 17, - width: 17, - color: currentView?.activeColor, - })} - {currentView?.name || "Select"} - - - - {views.map((field) => ( - { - actionActions.pathCondition(index, { - value: String(field.view), - }) - }} - > - {field.name} - - ))} - - + { - setGeneralSetting("translationLanguage", value) - }} - options={Object.values(LanguageMap)} - /> - - - - + + Action Language - {/* Subscriptions */} - - - - - +