From 3cb38fdc2ebe0d8090d2d73e166ac04f55b279f3 Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 09:05:06 -0800
Subject: [PATCH 01/14] chore: dep upg

---
 package.json                              |  2 +-
 patches/react-native-tab-view+4.0.1.patch | 13 +----
 yarn.lock                                 | 70 ++++++++++++++++-------
 3 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 5bd72b631..42efc7ba8 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "deepmerge": "^4.3.1",
     "dropbox": "git+https://lovegaoshi@github.com/lovegaoshi/dropbox-sdk-js.git",
     "event-target-polyfill": "^0.0.4",
-    "expo": "^52.0.2",
+    "expo": "^52.0.3",
     "expo-auth-session": "~6.0.0",
     "expo-clipboard": "~7.0.0",
     "expo-crypto": "~14.0.1",
diff --git a/patches/react-native-tab-view+4.0.1.patch b/patches/react-native-tab-view+4.0.1.patch
index 9b3394140..2b8439ccf 100644
--- a/patches/react-native-tab-view+4.0.1.patch
+++ b/patches/react-native-tab-view+4.0.1.patch
@@ -11,15 +11,4 @@ index 2b6be5a..aa099b7 100644
 +        position.setValue(index);
        } else {
          pagerRef.current?.setPageWithoutAnimation(index);
-         position.setValue(index);
-@@ -115,8 +116,10 @@ function PagerViewAdapter({
-       }),
-       onPageSelected: e => {
-         const index = e.nativeEvent.position;
-+        setTimeout(() => {        
-         indexRef.current = index;
-         onIndexChange(index);
-+}, 100)
-       },
-       onPageScrollStateChanged: onPageScrollStateChanged,
-       scrollEnabled: swipeEnabled,
\ No newline at end of file
+         position.setValue(index);
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index cd5d7585a..82426e087 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1783,9 +1783,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/cli@npm:0.20.6":
-  version: 0.20.6
-  resolution: "@expo/cli@npm:0.20.6"
+"@expo/cli@npm:0.21.0":
+  version: 0.21.0
+  resolution: "@expo/cli@npm:0.21.0"
   dependencies:
     "@0no-co/graphql.web": "npm:^1.0.8"
     "@babel/runtime": "npm:^7.20.0"
@@ -1860,7 +1860,7 @@ __metadata:
     ws: "npm:^8.12.1"
   bin:
     expo-internal: build/bin/cli
-  checksum: 10c0/45823b513b627bf1253acd32ef979e2364f1f26f374638534b08ec97369e46f51100b8c0bc5d6a6f7556cd65176f5f6e1914838743955262e8808268a8aa2870
+  checksum: 10c0/2d5d1653befad468915671b1554473bc25ebc5f636c2614541e5278b46e87119a69b54db56d436b1630e84f46cf47d4e84aa2ffcbe4a1bc2e390e2b53375e179
   languageName: node
   linkType: hard
 
@@ -1874,9 +1874,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/config-plugins@npm:9.0.8":
-  version: 9.0.8
-  resolution: "@expo/config-plugins@npm:9.0.8"
+"@expo/config-plugins@npm:9.0.9":
+  version: 9.0.9
+  resolution: "@expo/config-plugins@npm:9.0.9"
   dependencies:
     "@expo/config-types": "npm:^52.0.0"
     "@expo/json-file": "npm:~9.0.0"
@@ -1892,7 +1892,7 @@ __metadata:
     slugify: "npm:^1.6.6"
     xcode: "npm:^3.0.1"
     xml2js: "npm:0.6.0"
-  checksum: 10c0/b0ed70b973f64c7bf8c15a3c4997a4c07538f6da3d96d33ae7b40df11670555e64d20baf5ebed591e31fd4565c51d098ff91d9e386ef400018f34e3c6b21733c
+  checksum: 10c0/ca38b671327ab5d0a58466a96bfc8f64d71890687c5d0a46515553b9a451e6bd81f6eedba783a1d81d8c0542bd49c031d53797d234ad1283ec9e67517da8b5c7
   languageName: node
   linkType: hard
 
@@ -2056,7 +2056,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/metro-config@npm:0.19.0, @expo/metro-config@npm:~0.19.0":
+"@expo/metro-config@npm:0.19.1":
+  version: 0.19.1
+  resolution: "@expo/metro-config@npm:0.19.1"
+  dependencies:
+    "@babel/core": "npm:^7.20.0"
+    "@babel/generator": "npm:^7.20.5"
+    "@babel/parser": "npm:^7.20.0"
+    "@babel/types": "npm:^7.20.0"
+    "@expo/config": "npm:~10.0.0"
+    "@expo/env": "npm:~0.4.0"
+    "@expo/json-file": "npm:~9.0.0"
+    "@expo/spawn-async": "npm:^1.7.2"
+    chalk: "npm:^4.1.0"
+    debug: "npm:^4.3.2"
+    fs-extra: "npm:^9.1.0"
+    getenv: "npm:^1.0.0"
+    glob: "npm:^10.4.2"
+    jsc-safe-url: "npm:^0.2.4"
+    lightningcss: "npm:~1.27.0"
+    minimatch: "npm:^3.0.4"
+    postcss: "npm:~8.4.32"
+    resolve-from: "npm:^5.0.0"
+  checksum: 10c0/b0e062f19b2b366af4c461d2d9f61740643e32e391ae6e8c4568ae7b5b831174d2232d2119b14eff4f62b215e0f2690983a4d1634c0134797d4344f48d471c41
+  languageName: node
+  linkType: hard
+
+"@expo/metro-config@npm:~0.19.0":
   version: 0.19.0
   resolution: "@expo/metro-config@npm:0.19.0"
   dependencies:
@@ -5259,7 +5285,7 @@ __metadata:
     eslint-plugin-react: "npm:^7.37.2"
     eslint-plugin-react-hooks: "npm:^5.0.0"
     event-target-polyfill: "npm:^0.0.4"
-    expo: "npm:^52.0.2"
+    expo: "npm:^52.0.3"
     expo-auth-session: "npm:~6.0.0"
     expo-clipboard: "npm:~7.0.0"
     expo-crypto: "npm:~14.0.1"
@@ -8475,12 +8501,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo-modules-core@npm:2.0.0":
-  version: 2.0.0
-  resolution: "expo-modules-core@npm:2.0.0"
+"expo-modules-core@npm:2.0.1":
+  version: 2.0.1
+  resolution: "expo-modules-core@npm:2.0.1"
   dependencies:
     invariant: "npm:^2.2.4"
-  checksum: 10c0/be4f96a4f76293e3ae7365da2d91bf0e7b7156ced70602105826113a67c867dfe506cce6c6e826072417e9a54da215a921cf6ea716f315a96b5d435676b97ad7
+  checksum: 10c0/3e18165d01e6e396957b0e128bc619aef81b7997c725283a17e049c6fdff554ac134701692f392d2ef9e089fcdfc9ebaffcbd6607a2107cc512b9882a33c3faa
   languageName: node
   linkType: hard
 
@@ -8503,16 +8529,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo@npm:^52.0.2":
-  version: 52.0.2
-  resolution: "expo@npm:52.0.2"
+"expo@npm:^52.0.3":
+  version: 52.0.3
+  resolution: "expo@npm:52.0.3"
   dependencies:
     "@babel/runtime": "npm:^7.20.0"
-    "@expo/cli": "npm:0.20.6"
+    "@expo/cli": "npm:0.21.0"
     "@expo/config": "npm:10.0.3"
-    "@expo/config-plugins": "npm:9.0.8"
+    "@expo/config-plugins": "npm:9.0.9"
     "@expo/fingerprint": "npm:0.11.2"
-    "@expo/metro-config": "npm:0.19.0"
+    "@expo/metro-config": "npm:0.19.1"
     "@expo/vector-icons": "npm:^14.0.0"
     babel-preset-expo: "npm:~12.0.0"
     expo-asset: "npm:~11.0.1"
@@ -8521,7 +8547,7 @@ __metadata:
     expo-font: "npm:~13.0.1"
     expo-keep-awake: "npm:~14.0.1"
     expo-modules-autolinking: "npm:2.0.0"
-    expo-modules-core: "npm:2.0.0"
+    expo-modules-core: "npm:2.0.1"
     fbemitter: "npm:^3.0.0"
     web-streams-polyfill: "npm:^3.3.2"
     whatwg-url-without-unicode: "npm:8.0.0-3"
@@ -8540,7 +8566,7 @@ __metadata:
       optional: true
   bin:
     expo: bin/cli
-  checksum: 10c0/e468a0ee9f2afe496c34416cfcc448be582b2cf5ecb1f6cfc65bde7efe31cbccc2fe05ab4efd65080e7f2d411801d06da692f4eccefd243cd75d31705d3d1bb4
+  checksum: 10c0/5f338389650d58483482655c240ce91d84ce767658aed31d24f8b32064eb947f68065035a75fe5828822c756540dca02affc93e1753dc2a759c2997f9d9e528d
   languageName: node
   linkType: hard
 

From 7505bfd7ba9068dbda0e103466cdd6dbc2d5cd5e Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 09:41:06 -0800
Subject: [PATCH 02/14] chore: disable newarch

garbage
---
 android/gradle.properties                 |  2 +-
 patches/react-native-tab-view+4.0.1.patch | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 patches/react-native-tab-view+4.0.1.patch

diff --git a/android/gradle.properties b/android/gradle.properties
index 952ab614f..005807b44 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -35,7 +35,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=true
+newArchEnabled=false
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
diff --git a/patches/react-native-tab-view+4.0.1.patch b/patches/react-native-tab-view+4.0.1.patch
deleted file mode 100644
index 2b8439ccf..000000000
--- a/patches/react-native-tab-view+4.0.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/node_modules/react-native-tab-view/lib/commonjs/PagerViewAdapter.js b/node_modules/react-native-tab-view/lib/commonjs/PagerViewAdapter.js
-index 2b6be5a..aa099b7 100644
---- a/node_modules/react-native-tab-view/lib/commonjs/PagerViewAdapter.js
-+++ b/node_modules/react-native-tab-view/lib/commonjs/PagerViewAdapter.js
-@@ -54,7 +54,8 @@ function PagerViewAdapter({
-     }
-     if (indexRef.current !== index) {
-       if (animationEnabled) {
--        pagerRef.current?.setPage(index);
-+        pagerRef.current?.setPageWithoutAnimation(index);
-+        position.setValue(index);
-       } else {
-         pagerRef.current?.setPageWithoutAnimation(index);
-         position.setValue(index);
\ No newline at end of file

From 69eeaa4c8c846dc8086e9641745bacb28356210e Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 11:12:38 -0800
Subject: [PATCH 03/14] feat: billing

---
 src/App.tsx                     |  4 ++--
 src/components/billing/View.tsx |  1 +
 src/hooks/useVIP.ts             | 30 +++++++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 src/components/billing/View.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 7d16ca0eb..daccaeb4d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -16,7 +16,7 @@ import MainBackground from './components/background/MainBackground';
 import useTheme from './hooks/useTheme';
 // eslint-disable-next-line import/no-unresolved
 import { TRACKING } from '@env';
-import useVIP from './hooks/useVIP';
+import { useSetupVIP } from './hooks/useVIP';
 
 if (TRACKING) {
   Sentry.init({
@@ -52,7 +52,7 @@ const APM = ({ PIP, isLandscape }: { PIP: boolean; isLandscape: boolean }) => {
 };
 
 export default function App(appProps: NoxComponent.AppProps) {
-  const { vip } = useVIP();
+  const { vip } = useSetupVIP();
   const isSplashReady = useSplash(
     __DEV__ || appProps.intentData || vip ? 1 : 2500,
   );
diff --git a/src/components/billing/View.tsx b/src/components/billing/View.tsx
new file mode 100644
index 000000000..2d1ec2382
--- /dev/null
+++ b/src/components/billing/View.tsx
@@ -0,0 +1 @@
+export default () => {};
diff --git a/src/hooks/useVIP.ts b/src/hooks/useVIP.ts
index dbd4fec2f..c39d10871 100644
--- a/src/hooks/useVIP.ts
+++ b/src/hooks/useVIP.ts
@@ -1,5 +1,10 @@
 import * as SecureStore from 'expo-secure-store';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
+import Purchases from 'react-native-purchases';
+
+import { isAndroid } from '@utils/RNUtils';
+// eslint-disable-next-line import/no-unresolved
+import { APPSTORE } from '@env';
 
 const VIPKey = 'APMVIP';
 
@@ -17,4 +22,27 @@ const useVIP = () => {
   return { vip };
 };
 
+export const useSetupVIP = () => {
+  const { vip } = useVIP();
+
+  const init = async () => {
+    if (!APPSTORE) {
+      return;
+    }
+    if (isAndroid) {
+      Purchases.configure({ apiKey: 'goog_XXAuAgmqFMypeJIGHTlyRZNdoGh' });
+    }
+    try {
+      console.log('purhcase', await Purchases.getCustomerInfo());
+    } catch (e) {
+      console.error(e);
+    }
+  };
+
+  useEffect(() => {
+    init();
+  }, []);
+  return { vip };
+};
+
 export default useVIP;

From 1e49929709b7bf19996b7f0fa53f37e6f45a6f9a Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 12:51:11 -0800
Subject: [PATCH 04/14] feat: billing

---
 src/components/billing/View.tsx              | 93 +++++++++++++++++++-
 src/components/billing/bill.ts               |  4 -
 src/components/setting/DeveloperSettings.tsx |  8 --
 src/components/setting/View.tsx              | 17 +++-
 src/components/style.ts                      |  1 +
 src/hooks/useVIP.ts                          | 46 +++++++---
 src/localization/en/translation.json         | 14 ++-
 src/localization/zhcn/translation.json       | 14 ++-
 src/utils/Bilibili/BiliUser.ts               | 15 +++-
 9 files changed, 177 insertions(+), 35 deletions(-)
 delete mode 100644 src/components/billing/bill.ts

diff --git a/src/components/billing/View.tsx b/src/components/billing/View.tsx
index 2d1ec2382..388fe1f6a 100644
--- a/src/components/billing/View.tsx
+++ b/src/components/billing/View.tsx
@@ -1 +1,92 @@
-export default () => {};
+import { View } from 'react-native';
+import React, { useState } from 'react';
+import { Text, Button, ActivityIndicator } from 'react-native-paper';
+import { useTranslation } from 'react-i18next';
+import Purchases from 'react-native-purchases';
+
+import useVIP, { checkGuardVIP } from '@hooks/useVIP';
+import { styles } from '../style';
+import { StyleSheet } from 'react-native';
+
+interface LoadingChildrenProps {
+  setLoading: React.Dispatch<React.SetStateAction<boolean>>;
+}
+interface LoadingWrapperProps {
+  Child: (p: LoadingChildrenProps) => JSX.Element;
+}
+
+const LoadingIconWrapper = ({ Child }: LoadingWrapperProps) => {
+  const [loading, setLoading] = useState(false);
+  if (loading) {
+    return <ActivityIndicator />;
+  }
+  return <Child setLoading={setLoading} />;
+};
+
+const BiliVIP = ({ setLoading }: LoadingChildrenProps) => {
+  const { t } = useTranslation();
+
+  const checkBiliVIP = async () => {
+    setLoading(true);
+    await checkGuardVIP();
+    setLoading(false);
+  };
+
+  return <Button onPress={checkBiliVIP}>{t('Billing.NoxAuth')}</Button>;
+};
+
+const RevenueCatVIP = ({ setLoading }: LoadingChildrenProps) => {
+  const { t } = useTranslation();
+  const checkRevenueCatVIP = async () => {
+    setLoading(true);
+    try {
+      console.log('purhcase', await Purchases.getOfferings());
+    } catch (e) {
+      console.error(JSON.stringify(e));
+    }
+    setLoading(false);
+  };
+
+  return (
+    <Button onPress={checkRevenueCatVIP}>{t('Billing.RevenueCat')}</Button>
+  );
+};
+
+const PurchaseVIPScreen = () => {
+  const { t } = useTranslation();
+  return (
+    <View style={mStyle.container}>
+      <Text>{t('Billing.PremiumFeaturesIntro')}</Text>
+      <View style={styles.alignMiddle}>
+        <LoadingIconWrapper Child={BiliVIP} />
+        <LoadingIconWrapper Child={RevenueCatVIP} />
+      </View>
+      <Text>{t('Billing.NoxFans')}</Text>
+    </View>
+  );
+};
+
+const VIPScreen = () => {
+  const { t } = useTranslation();
+
+  return (
+    <View style={mStyle.container}>
+      <Text style={styles.centerText}>{t('Billing.thankU')}</Text>
+      <Text style={styles.centerText}>{t('Billing.godBlessU')}</Text>
+      <Text style={styles.centerText}>{t('Billing.urVeryVeryGorgeous')}</Text>
+    </View>
+  );
+};
+
+export default () => {
+  const vip = useVIP(state => state.VIP);
+
+  if (vip) {
+    return <VIPScreen />;
+  }
+  return <PurchaseVIPScreen />;
+};
+
+const mStyle = StyleSheet.create({
+  container: { flex: 1, paddingHorizontal: 10, paddingTop: 10 },
+});
diff --git a/src/components/billing/bill.ts b/src/components/billing/bill.ts
deleted file mode 100644
index 21b39dd77..000000000
--- a/src/components/billing/bill.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { getHasGuard } from '@utils/Bilibili/BiliUser';
-
-//暗精灵和小孩梓尊享APM VIP服务
-const getBiliVIPStatus = () => getHasGuard([529249, 7706705]);
diff --git a/src/components/setting/DeveloperSettings.tsx b/src/components/setting/DeveloperSettings.tsx
index 36f6c2643..00baa7b17 100644
--- a/src/components/setting/DeveloperSettings.tsx
+++ b/src/components/setting/DeveloperSettings.tsx
@@ -32,7 +32,6 @@ import {
   enableTanaka,
 } from '@hooks/useTanakaAmazingCommodities';
 import { isAndroid } from '@utils/RNUtils';
-import { purchaseVIP } from '@hooks/useVIP';
 
 enum Icons {
   setlog = 'console',
@@ -45,7 +44,6 @@ enum Icons {
   fade = 'cosine-wave',
   plugins = 'puzzle',
   Tanaka = 'emoticon-devil',
-  VIP = 'cash',
 }
 
 enum VIEW {
@@ -324,12 +322,6 @@ const Home = ({ navigation }: NoxComponent.StackNavigationProps) => {
             }
             settingCategory="DeveloperSettings"
           />
-          <SettingListItem
-            icon={Icons.VIP}
-            settingName="VIP"
-            onPress={purchaseVIP}
-            settingCategory="DeveloperSettings"
-          />
         </List.Section>
       </ScrollView>
       <GenericSelectDialog
diff --git a/src/components/setting/View.tsx b/src/components/setting/View.tsx
index aa27e42f5..c7455bc47 100644
--- a/src/components/setting/View.tsx
+++ b/src/components/setting/View.tsx
@@ -13,7 +13,8 @@ import LanguageSettings from './LanguageSettings';
 import AboutSettings from './AboutSettings';
 import SplashSettings from './SplashSettings';
 import DownloadSettings from './DownloadSettings';
-import Login from '../login/View';
+import LoginSettings from '../login/View';
+import PremiumSettings from '../billing/View';
 import { isAndroid, isIOS } from '@utils/RNUtils';
 
 enum NoxView {
@@ -27,6 +28,7 @@ enum NoxView {
   SPLASH_GALLARY = 'view-gallery',
   ALIST = 'google-cloud',
   DOWNLOAD = 'file-download',
+  PREMIUM = 'cash',
 
   DUMMY = 'Features not implemented',
   GENERAL = 'General',
@@ -94,6 +96,12 @@ const HomeSettings = ({ navigation }: Props) => {
           onPress={() => navigation.navigate(NoxView.DEVELOPER)}
           settingCategory="Settings"
         />
+        <SettingListItem
+          icon={NoxView.PREMIUM}
+          settingName="PremiumSetting"
+          onPress={() => navigation.navigate(NoxView.PREMIUM)}
+          settingCategory="Settings"
+        />
         <SettingListItem
           icon={NoxView.SPLASH_GALLARY}
           settingName="SplashSetting"
@@ -165,9 +173,14 @@ const Settings = ({ headerBackVisible = true }: Props) => {
       />
       <Stack.Screen
         name={NoxView.LOGIN}
-        component={Login}
+        component={LoginSettings}
         options={{ title: t('appDrawer.LoginName') }}
       />
+      <Stack.Screen
+        name={NoxView.PREMIUM}
+        component={PremiumSettings}
+        options={{ title: t('appDrawer.PremiumName') }}
+      />
     </Stack.Navigator>
   );
 };
diff --git a/src/components/style.ts b/src/components/style.ts
index 615ee1685..e19477f3c 100644
--- a/src/components/style.ts
+++ b/src/components/style.ts
@@ -148,6 +148,7 @@ export const replaceStyleColor = ({
 
 export const styles = StyleSheet.create({
   flex: { flex: 1 },
+  centerText: { textAlign: 'center' },
   screenContainer: {
     flex: 1,
     backgroundColor: 'white',
diff --git a/src/hooks/useVIP.ts b/src/hooks/useVIP.ts
index c39d10871..b42a7bc69 100644
--- a/src/hooks/useVIP.ts
+++ b/src/hooks/useVIP.ts
@@ -1,29 +1,53 @@
 import * as SecureStore from 'expo-secure-store';
 import { useEffect, useState } from 'react';
 import Purchases from 'react-native-purchases';
+import { create } from 'zustand';
 
 import { isAndroid } from '@utils/RNUtils';
+import { getHasGuard } from '@utils/Bilibili/BiliUser';
 // eslint-disable-next-line import/no-unresolved
 import { APPSTORE } from '@env';
 
 const VIPKey = 'APMVIP';
 
-export const purchaseVIP = () => {
+export const checkGuardVIP = async () => {
+  if (await getHasGuard([529249, 7706705])) {
+    return purchaseVIP();
+  }
+};
+
+export const checkVIP = async () => {
+  const customer = await Purchases.getCustomerInfo();
+  if (
+    customer.entitlements.active.vip ||
+    (await getHasGuard([529249, 7706705]))
+  ) {
+    return purchaseVIP();
+  }
+  return loseVIP();
+};
+
+const purchaseVIP = () => {
   SecureStore.setItemAsync(VIPKey, '1');
+  useVIP.setState({ VIP: true });
 };
 
-export const loseVIP = () => {
+const loseVIP = () => {
   SecureStore.deleteItemAsync(VIPKey);
+  useVIP.setState({ VIP: false });
 };
 
-const useVIP = () => {
-  const [vip, setVip] = useState(SecureStore.getItem(VIPKey) !== null);
+interface VIPStore {
+  VIP: boolean;
+}
+const useVIP = create<VIPStore>((set, get) => ({
+  VIP: SecureStore.getItem(VIPKey) !== null,
+}));
 
-  return { vip };
-};
+export default useVIP;
 
 export const useSetupVIP = () => {
-  const { vip } = useVIP();
+  const vip = useVIP(state => state.VIP);
 
   const init = async () => {
     if (!APPSTORE) {
@@ -32,11 +56,7 @@ export const useSetupVIP = () => {
     if (isAndroid) {
       Purchases.configure({ apiKey: 'goog_XXAuAgmqFMypeJIGHTlyRZNdoGh' });
     }
-    try {
-      console.log('purhcase', await Purchases.getCustomerInfo());
-    } catch (e) {
-      console.error(e);
-    }
+    checkVIP();
   };
 
   useEffect(() => {
@@ -44,5 +64,3 @@ export const useSetupVIP = () => {
   }, []);
   return { vip };
 };
-
-export default useVIP;
diff --git a/src/localization/en/translation.json b/src/localization/en/translation.json
index be02d9df5..d9febe5cd 100644
--- a/src/localization/en/translation.json
+++ b/src/localization/en/translation.json
@@ -1,10 +1,20 @@
 {
   "_comment": "src/localization/en/translation.json",
+  "Billing": {
+    "PremiumFeaturesIntro": "Thank you for considering supporting APM with real money. All funds will go towards buying a copy of Buldur's Gate 3. In return, APM will hide the app start splash ad.",
+    "NoxAuth": "Authenticate through Bilibili",
+    "RevenueCat": "Purchase via RevenueCat",
+    "NoxFans": "Bilibili users that are currently \"guards\" to Azusa and Nox will be granted premium access for free. Please click the Bilibili Auth button above to authenticate.",
+    "thankU": "Thank you!",
+    "godBlessU": "God bless you!",
+    "urVeryVeryGorgeous": "You are very very gorgeous."
+  },
   "appDrawer": {
     "homeScreenName": "Home",
     "exploreScreenName": "Discover",
     "settingScreenName": "Settings",
-    "LoginName": "User Login"
+    "LoginName": "User Login",
+    "PremiumName": "Premium Content"
   },
   "Dialog": {
     "ok": "Done",
@@ -200,6 +210,8 @@
     "SplashSettingDesc": "View APM's splash ads",
     "DeveloperOptionsName": "Developer Options",
     "DeveloperOptionsDesc": "Experimental Options in pre-release versions of APM",
+    "PremiumSettingName": "Premium APM",
+    "PremiumSettingDesc": "Buy Premium features",
     "AListOptionsName": "AList",
     "AListOptionsDesc": "Set up AList creds",
     "DownloadOptionsName": "Download",
diff --git a/src/localization/zhcn/translation.json b/src/localization/zhcn/translation.json
index 3f04aceae..d4d172db7 100644
--- a/src/localization/zhcn/translation.json
+++ b/src/localization/zhcn/translation.json
@@ -1,5 +1,14 @@
 {
   "_comment": "src/localization/en/translation.json",
+  "Billing": {
+    "PremiumFeaturesIntro": "感谢你对中国管人事业的支持。您赞助的每一分钱将用于购买《博德之门3》。在返回时，APM将隐藏启动广告。",
+    "NoxAuth": "b站认证",
+    "RevenueCat": "Purchase via RevenueCat",
+    "NoxFans": "暗精灵和小孩梓当月舰长尊享APM VIP服务。点击上方b站认证即可。",
+    "thankU": "又要到饭了兄弟们",
+    "godBlessU": "又要到饭了兄弟们",
+    "urVeryVeryGorgeous": "又要到饭了兄弟们"
+  },
   "BiliCategory": {
     "top": "b站全站音乐榜",
     "ranking": "b站音乐区排行榜",
@@ -16,7 +25,8 @@
     "homeScreenName": "音乐",
     "exploreScreenName": "发现",
     "settingScreenName": "设置",
-    "LoginName": "b站登录"
+    "LoginName": "b站登录",
+    "PremiumName": "高级播放器"
   },
   "Dialog": {
     "ok": "好的",
@@ -214,6 +224,8 @@
     "SplashSettingDesc": "观赏管人播放器的开屏广告",
     "DeveloperOptionsName": "开发者选项",
     "DeveloperOptionsDesc": "正在测试的功能",
+    "PremiumSettingName": "高级播放器",
+    "PremiumSettingDesc": "购买高级播放器",
     "AListOptionsName": "AList",
     "AListOptionsDesc": "AList密钥设置",
     "DownloadOptionsName": "下载",
diff --git a/src/utils/Bilibili/BiliUser.ts b/src/utils/Bilibili/BiliUser.ts
index 4133cf09b..c05484005 100644
--- a/src/utils/Bilibili/BiliUser.ts
+++ b/src/utils/Bilibili/BiliUser.ts
@@ -30,10 +30,17 @@ const getUserGuard = async () => {
 
 // simple function that filters is user has guard > 0.
 export const getHasGuard = async (hasGuard: number[] = []) => {
-  const guards = await getUserGuard();
-  return guards.filter(
-    (guard: any) => guard.guard_level > 0 && hasGuard.includes(guard.target_id),
-  );
+  try {
+    const guards = await getUserGuard();
+    return (
+      guards.filter(
+        (guard: any) =>
+          guard.guard_level > 0 && hasGuard.includes(guard.target_id),
+      ).length > 0
+    );
+  } catch {
+    return false;
+  }
 };
 
 export default getUser;

From 1a4956e36e27a8c119f5347ee828e41a8e780126 Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 12:55:33 -0800
Subject: [PATCH 05/14] Update translation.json

---
 src/localization/zhcn/translation.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/localization/zhcn/translation.json b/src/localization/zhcn/translation.json
index d4d172db7..3c1d0f4f9 100644
--- a/src/localization/zhcn/translation.json
+++ b/src/localization/zhcn/translation.json
@@ -5,9 +5,9 @@
     "NoxAuth": "b站认证",
     "RevenueCat": "Purchase via RevenueCat",
     "NoxFans": "暗精灵和小孩梓当月舰长尊享APM VIP服务。点击上方b站认证即可。",
-    "thankU": "又要到饭了兄弟们",
-    "godBlessU": "又要到饭了兄弟们",
-    "urVeryVeryGorgeous": "又要到饭了兄弟们"
+    "thankU": "又要到饭了兄弟们!",
+    "godBlessU": "太破费了太破费了，好久没有收到这么贵重的礼物了",
+    "urVeryVeryGorgeous": "最后祝您身体健康万事如意，股票upup"
   },
   "BiliCategory": {
     "top": "b站全站音乐榜",

From dbb064e8882c3f52af7db8812ce2b16c825e880b Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 13:38:53 -0800
Subject: [PATCH 06/14] feat: billing

---
 src/components/billing/View.tsx          | 26 +++++++++++++++
 src/components/setting/AboutSettings.tsx | 42 ++++++++----------------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/components/billing/View.tsx b/src/components/billing/View.tsx
index 388fe1f6a..934102642 100644
--- a/src/components/billing/View.tsx
+++ b/src/components/billing/View.tsx
@@ -2,6 +2,7 @@ import { View } from 'react-native';
 import React, { useState } from 'react';
 import { Text, Button, ActivityIndicator } from 'react-native-paper';
 import { useTranslation } from 'react-i18next';
+import { Image } from 'expo-image';
 import Purchases from 'react-native-purchases';
 
 import useVIP, { checkGuardVIP } from '@hooks/useVIP';
@@ -56,6 +57,12 @@ const PurchaseVIPScreen = () => {
   const { t } = useTranslation();
   return (
     <View style={mStyle.container}>
+      <Image
+        style={mStyle.azusaBeg}
+        source={{
+          uri: 'https://img.nga.178.com/attachments/mon_202201/31/-zue37Q2p-ixpkXsZ7tT3cS9y-af.gif',
+        }}
+      />
       <Text>{t('Billing.PremiumFeaturesIntro')}</Text>
       <View style={styles.alignMiddle}>
         <LoadingIconWrapper Child={BiliVIP} />
@@ -71,6 +78,12 @@ const VIPScreen = () => {
 
   return (
     <View style={mStyle.container}>
+      <Image
+        style={mStyle.azusaMock}
+        source={{
+          uri: 'https://img.nga.178.com/attachments/mon_202202/01/-zue37Q2p-6rfwK2dT1kShs-b4.jpg',
+        }}
+      />
       <Text style={styles.centerText}>{t('Billing.thankU')}</Text>
       <Text style={styles.centerText}>{t('Billing.godBlessU')}</Text>
       <Text style={styles.centerText}>{t('Billing.urVeryVeryGorgeous')}</Text>
@@ -89,4 +102,17 @@ export default () => {
 
 const mStyle = StyleSheet.create({
   container: { flex: 1, paddingHorizontal: 10, paddingTop: 10 },
+  text: {
+    fontSize: 20,
+  },
+  azusaBeg: {
+    width: '100%',
+    height: '40%',
+    alignSelf: 'center',
+  },
+  azusaMock: {
+    width: '100%',
+    height: '30%',
+    alignSelf: 'center',
+  },
 });
diff --git a/src/components/setting/AboutSettings.tsx b/src/components/setting/AboutSettings.tsx
index 210f45efe..1b9b0a8dd 100644
--- a/src/components/setting/AboutSettings.tsx
+++ b/src/components/setting/AboutSettings.tsx
@@ -1,4 +1,4 @@
-import { View, ScrollView, Linking } from 'react-native';
+import { View, ScrollView, Linking, StyleSheet } from 'react-native';
 import { Text, Button } from 'react-native-paper';
 import { useTranslation } from 'react-i18next';
 
@@ -17,36 +17,12 @@ export default () => {
     >
       <ScrollView>
         <Text>{''}</Text>
-        <Text
-          style={{
-            fontSize: 20,
-            color: playerStyle.colors.primary,
-            paddingHorizontal: 20,
-          }}
-        >
-          {t('About.Disclaimer1')}
-        </Text>
+        <Text style={styles.text}>{t('About.Disclaimer1')}</Text>
         <Text>{''}</Text>
-        <Text
-          style={{
-            fontSize: 20,
-            color: playerStyle.colors.primary,
-            paddingHorizontal: 20,
-          }}
-        >
-          {t('About.Disclaimer2')}
-        </Text>
+        <Text style={styles.text}>{t('About.Disclaimer2')}</Text>
         <Text>{''}</Text>
-        <Text
-          style={{
-            fontSize: 20,
-            color: playerStyle.colors.primary,
-            paddingHorizontal: 20,
-          }}
-        >
-          {t('About.About1')}
-        </Text>
-        <View style={{ flexDirection: 'row', justifyContent: 'center' }}>
+        <Text style={styles.text}>{t('About.About1')}</Text>
+        <View style={styles.centeredRowContainer}>
           <Button
             onPress={() =>
               Linking.openURL(
@@ -68,3 +44,11 @@ export default () => {
     </View>
   );
 };
+
+const styles = StyleSheet.create({
+  text: {
+    fontSize: 20,
+    paddingHorizontal: 20,
+  },
+  centeredRowContainer: { flexDirection: 'row', justifyContent: 'center' },
+});

From adba6aca335a3ed58f957d4b8d6dc62e012c612f Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:38:13 -0800
Subject: [PATCH 07/14] feat: billing

---
 src/components/explore/SongTab.tsx     | 49 ++++++++++++++------------
 src/hooks/useVIP.ts                    | 24 ++++++++-----
 src/localization/zhcn/translation.json |  2 +-
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/components/explore/SongTab.tsx b/src/components/explore/SongTab.tsx
index 7d6d76130..6d3facafe 100644
--- a/src/components/explore/SongTab.tsx
+++ b/src/components/explore/SongTab.tsx
@@ -5,6 +5,7 @@ import {
   Dimensions,
   FlatList,
   TouchableOpacity,
+  StyleSheet,
 } from 'react-native';
 import { Text } from 'react-native-paper';
 import { Image } from 'expo-image';
@@ -15,6 +16,7 @@ import { useNoxSetting } from '@stores/useApp';
 import usePlayback from '@hooks/usePlayback';
 import { NoxRoutes } from '@enums/Routes';
 import useNavigation from '@hooks/useNavigation';
+import { styles } from '../style';
 
 export interface BiliCatSongs {
   [key: number]: NoxMedia.Song[];
@@ -39,22 +41,15 @@ export const BiliSongCard = ({
   const fontColor = playerStyle.colors.primary;
 
   return (
-    <View
-      style={{
-        width: Dimensions.get('window').width * 0.8,
-        height: 390,
-        paddingRight: 10,
-        paddingLeft: 5,
-      }}
-    >
+    <View style={style.cardContainer}>
       {title && <Text style={{ fontSize: 20, color: fontColor }}>{title}</Text>}
       <FlatList
         showsVerticalScrollIndicator={false}
         data={songs}
         renderItem={({ item }) => (
-          <View style={{ paddingVertical: 10 }}>
+          <View style={style.padding}>
             <TouchableOpacity
-              style={{ height: 70, flexDirection: 'row' }}
+              style={style.cardPressable}
               onPress={() => {
                 navigationGlobal.navigate({
                   route: NoxRoutes.PlayerHome,
@@ -67,11 +62,8 @@ export const BiliSongCard = ({
                 }).then(() => setTimeout(scroll, 500));
               }}
             >
-              <Image
-                style={{ width: 70, height: 70, borderRadius: 5 }}
-                source={{ uri: item.cover }}
-              />
-              <View style={{ flex: 1 }}>
+              <Image style={style.cardThumbnail} source={{ uri: item.cover }} />
+              <View style={styles.flex}>
                 <Text
                   style={{
                     color: fontColor,
@@ -107,9 +99,7 @@ export const BiliSongCatsCard = ({ songs = {} }: { songs?: BiliCatSongs }) => {
 
   return (
     <View>
-      <Text style={{ fontSize: 20, paddingLeft: 5, paddingBottom: 10 }}>
-        {t('BiliCategory.ranking')}
-      </Text>
+      <Text style={style.catContainer}>{t('BiliCategory.ranking')}</Text>
       <ScrollView
         horizontal
         disableIntervalMomentum
@@ -124,7 +114,7 @@ export const BiliSongCatsCard = ({ songs = {} }: { songs?: BiliCatSongs }) => {
             songs={songs[Number(k)]}
           />
         ))}
-        <View style={{ width: Dimensions.get('window').width * 0.2 }}></View>
+        <View style={style.paddingVertical}></View>
       </ScrollView>
     </View>
   );
@@ -141,9 +131,7 @@ export const BiliSongsArrayTabCard = ({
 
   return (
     <View>
-      <Text style={{ fontSize: 20, paddingLeft: 5, paddingBottom: 10 }}>
-        {title}
-      </Text>
+      <Text style={style.arrayText}>{title}</Text>
       <ScrollView
         horizontal
         disableIntervalMomentum
@@ -158,7 +146,7 @@ export const BiliSongsArrayTabCard = ({
             totalSongs={songs}
           />
         ))}
-        <View style={{ width: Dimensions.get('window').width * 0.2 }}></View>
+        <View style={style.paddingVertical}></View>
       </ScrollView>
     </View>
   );
@@ -178,3 +166,18 @@ export const BiliSongsTabCard = ({
 
   return <BiliSongsArrayTabCard title={title} songs={concatSongs} />;
 };
+
+const style = StyleSheet.create({
+  cardContainer: {
+    width: Dimensions.get('window').width * 0.8,
+    height: 390,
+    paddingRight: 10,
+    paddingLeft: 5,
+  },
+  padding: { paddingVertical: 10 },
+  cardPressable: { height: 70, flexDirection: 'row' },
+  cardThumbnail: { width: 70, height: 70, borderRadius: 5 },
+  catContainer: { fontSize: 20, paddingLeft: 5, paddingBottom: 10 },
+  paddingVertical: { width: Dimensions.get('window').width * 0.2 },
+  arrayText: { fontSize: 20, paddingLeft: 5, paddingBottom: 10 },
+});
diff --git a/src/hooks/useVIP.ts b/src/hooks/useVIP.ts
index b42a7bc69..c857661a1 100644
--- a/src/hooks/useVIP.ts
+++ b/src/hooks/useVIP.ts
@@ -9,26 +9,32 @@ import { getHasGuard } from '@utils/Bilibili/BiliUser';
 import { APPSTORE } from '@env';
 
 const VIPKey = 'APMVIP';
+enum VIPType {
+  Bilibili = 'Bilibili',
+  RevenueCat = 'RevenueCat',
+}
 
 export const checkGuardVIP = async () => {
   if (await getHasGuard([529249, 7706705])) {
     return purchaseVIP();
   }
+  return loseVIP();
 };
 
 export const checkVIP = async () => {
-  const customer = await Purchases.getCustomerInfo();
-  if (
-    customer.entitlements.active.vip ||
-    (await getHasGuard([529249, 7706705]))
-  ) {
-    return purchaseVIP();
+  const vipStatus = SecureStore.getItem(VIPKey);
+  switch (vipStatus) {
+    // BILI VIP will be rechecked every time
+    case VIPType.Bilibili:
+      return checkGuardVIP();
+    // revenueCat is a one-time purchase
+    default:
+      return;
   }
-  return loseVIP();
 };
 
-const purchaseVIP = () => {
-  SecureStore.setItemAsync(VIPKey, '1');
+const purchaseVIP = (type = VIPType.RevenueCat) => {
+  SecureStore.setItemAsync(VIPKey, type);
   useVIP.setState({ VIP: true });
 };
 
diff --git a/src/localization/zhcn/translation.json b/src/localization/zhcn/translation.json
index 3c1d0f4f9..b40467d1c 100644
--- a/src/localization/zhcn/translation.json
+++ b/src/localization/zhcn/translation.json
@@ -3,7 +3,7 @@
   "Billing": {
     "PremiumFeaturesIntro": "感谢你对中国管人事业的支持。您赞助的每一分钱将用于购买《博德之门3》。在返回时，APM将隐藏启动广告。",
     "NoxAuth": "b站认证",
-    "RevenueCat": "Purchase via RevenueCat",
+    "RevenueCat": "RevenueCat购买",
     "NoxFans": "暗精灵和小孩梓当月舰长尊享APM VIP服务。点击上方b站认证即可。",
     "thankU": "又要到饭了兄弟们!",
     "godBlessU": "太破费了太破费了，好久没有收到这么贵重的礼物了",

From a472a6c34b62a7950c7583b128cc1bf72be3b29d Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:48:12 -0800
Subject: [PATCH 08/14] chore: remove newarch patch

---
 ...-gradle-plugin-npm-0.76.1-f19c439d00.patch | 11 ----
 .../react-native-npm-0.76.1-c738a2fa39.patch  | 55 -------------------
 android/settings.gradle                       | 11 +---
 package.json                                  |  4 +-
 yarn.lock                                     |  8 +--
 5 files changed, 7 insertions(+), 82 deletions(-)
 delete mode 100644 .yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch
 delete mode 100644 .yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch

diff --git a/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch b/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch
deleted file mode 100644
index dc3cfd28e..000000000
--- a/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
-index 05a07e86f7b45ceb558dc761d32c5d2305c9a69f..e0c719783bd0f2c1dc57f39bdd40e10aa21e681b 100644
---- a/gradle/libs.versions.toml
-+++ b/gradle/libs.versions.toml
-@@ -1,5 +1,5 @@
- [versions]
--agp = "8.6.0"
-+agp = "8.7.2"
- gson = "2.8.9"
- guava = "31.0.1-jre"
- javapoet = "1.13.0"
diff --git a/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch b/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch
deleted file mode 100644
index 1e80d1154..000000000
--- a/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt
-index ecce67478dd9d01567b9ad9cd598a3234d5a52a3..70261eb627d620eb4e5c6d371b69b0a140a2d1e9 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt
-+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt
-@@ -65,6 +65,8 @@ public open class JavaTimerManager(
- 
-   init {
-     reactApplicationContext.addLifecycleEventListener(this)
-+    HeadlessJsTaskContext.getInstance(reactApplicationContext)
-+        .addTaskEventListener(this)
-   }
- 
-   override fun onHostPause() {
-@@ -103,6 +105,8 @@ public open class JavaTimerManager(
-   }
- 
-   public open fun onInstanceDestroy() {
-+    HeadlessJsTaskContext.getInstance(reactApplicationContext)
-+      .removeTaskEventListener(this)
-     reactApplicationContext.removeLifecycleEventListener(this)
-     clearFrameCallback()
-     clearChoreographerIdleCallback()
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt
-index bfa0219acf2454d84b30a8428e6b38d6a64db387..caf7846a322d869748a22bcddcbda4c0305307ba 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt
-+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt
-@@ -12,7 +12,6 @@ import com.facebook.react.bridge.ReactApplicationContext
- import com.facebook.react.bridge.WritableArray
- import com.facebook.react.common.annotations.VisibleForTesting
- import com.facebook.react.devsupport.interfaces.DevSupportManager
--import com.facebook.react.jstasks.HeadlessJsTaskContext
- import com.facebook.react.module.annotations.ReactModule
- 
- /** Native module for JS timer execution. Timers fire on frame boundaries. */
-@@ -24,11 +23,6 @@ public class TimingModule(
-   private val javaTimerManager: JavaTimerManager =
-       JavaTimerManager(reactContext, this, ReactChoreographer.getInstance(), devSupportManager)
- 
--  override fun initialize() {
--    HeadlessJsTaskContext.getInstance(getReactApplicationContext())
--        .addTaskEventListener(javaTimerManager)
--  }
--
-   override fun createTimer(
-       callbackIDDouble: Double,
-       durationDouble: Double,
-@@ -68,8 +62,6 @@ public class TimingModule(
-   }
- 
-   override fun invalidate() {
--    val headlessJsTaskContext = HeadlessJsTaskContext.getInstance(getReactApplicationContext())
--    headlessJsTaskContext.removeTaskEventListener(javaTimerManager)
-     javaTimerManager.onInstanceDestroy()
-   }
- 
diff --git a/android/settings.gradle b/android/settings.gradle
index c227d4ec4..f57645922 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -7,13 +7,4 @@ include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
-
-includeBuild('../node_modules/react-native') {
- dependencySubstitution {
-  substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid"))
-  substitute(module("com.facebook.react:react-native")).using(project(":packages:react-native:ReactAndroid"))
-  substitute(module("com.facebook.react:hermes-android")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
-  substitute(module("com.facebook.react:hermes-engine")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
- }
-}
\ No newline at end of file
+useExpoModules()
\ No newline at end of file
diff --git a/package.json b/package.json
index 42efc7ba8..a9a421d7a 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@react-native-cookies/cookies": "^6.2.1",
     "@react-native-masked-view/masked-view": "^0.3.2",
     "@react-native/babel-preset": "^0.76.1",
-    "@react-native/gradle-plugin": "patch:@react-native/gradle-plugin@npm%3A0.76.1#~/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch",
+    "@react-native/gradle-plugin": "^0.76.1",
     "@react-native/metro-config": "^0.76.1",
     "@react-native/typescript-config": "0.76.1",
     "@react-navigation/drawer": "^7.0.1",
@@ -86,7 +86,7 @@
     "qs": "^6.13.0",
     "react": "18.3.1",
     "react-i18next": "^15.1.1",
-    "react-native": "patch:react-native@npm%3A0.76.1#~/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch",
+    "react-native": "^0.76.1",
     "react-native-app-auth": "^8.0.0",
     "react-native-background-timer": "git+https://github.com/lovegaoshi/react-native-background-timer.git",
     "react-native-blob-jsi-helper": "^0.3.1",
diff --git a/yarn.lock b/yarn.lock
index 82426e087..6d788a27b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3253,7 +3253,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native/gradle-plugin@npm:0.76.1":
+"@react-native/gradle-plugin@npm:0.76.1, @react-native/gradle-plugin@npm:^0.76.1":
   version: 0.76.1
   resolution: "@react-native/gradle-plugin@npm:0.76.1"
   checksum: 10c0/7056ff70ff42d9575eb35fd63ce7accb42caffb08839bcf32abd5a83e3016be9e8b56a115e927b45302c94e3ad88e928283354577fc77547b13c0c84183e016b
@@ -5229,7 +5229,7 @@ __metadata:
     "@react-native-cookies/cookies": "npm:^6.2.1"
     "@react-native-masked-view/masked-view": "npm:^0.3.2"
     "@react-native/babel-preset": "npm:^0.76.1"
-    "@react-native/gradle-plugin": "patch:@react-native/gradle-plugin@npm%3A0.76.1#~/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch"
+    "@react-native/gradle-plugin": "npm:^0.76.1"
     "@react-native/metro-config": "npm:^0.76.1"
     "@react-native/typescript-config": "npm:0.76.1"
     "@react-navigation/drawer": "npm:^7.0.1"
@@ -5314,7 +5314,7 @@ __metadata:
     qs: "npm:^6.13.0"
     react: "npm:18.3.1"
     react-i18next: "npm:^15.1.1"
-    react-native: "patch:react-native@npm%3A0.76.1#~/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch"
+    react-native: "npm:^0.76.1"
     react-native-app-auth: "npm:^8.0.0"
     react-native-background-timer: "git+https://github.com/lovegaoshi/react-native-background-timer.git"
     react-native-blob-jsi-helper: "npm:^0.3.1"
@@ -14371,7 +14371,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native@npm:0.76.1":
+"react-native@npm:0.76.1, react-native@npm:^0.76.1":
   version: 0.76.1
   resolution: "react-native@npm:0.76.1"
   dependencies:

From afd0ab727b8700f4b3f77847a92f0aab904eca06 Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:49:15 -0800
Subject: [PATCH 09/14] chore: remove newarch patch

---
 .github/workflows/android-weekly.yml | 16 ----------------
 .github/workflows/play-release.yml   | 16 ----------------
 2 files changed, 32 deletions(-)

diff --git a/.github/workflows/android-weekly.yml b/.github/workflows/android-weekly.yml
index 3284d6722..ca2c53d13 100644
--- a/.github/workflows/android-weekly.yml
+++ b/.github/workflows/android-weekly.yml
@@ -51,22 +51,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: false
-
       - name: Get branch name
         run: |
           # Short name for current branch. For PRs, use target branch (base ref)
diff --git a/.github/workflows/play-release.yml b/.github/workflows/play-release.yml
index 5a6042cf1..eb670f4f7 100644
--- a/.github/workflows/play-release.yml
+++ b/.github/workflows/play-release.yml
@@ -78,22 +78,6 @@ jobs:
       - name: clean generated builds
         run: rm -rf android/app/build/generated/
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: false
-
       - name: gradle build AAB
         run: cd android && chmod +x gradlew && ./gradlew bundleRelease
 

From 485d700319952ec3b559847bcbec7898dceed76f Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:51:40 -0800
Subject: [PATCH 10/14] chore: yarn dep

---
 package.json                         |  6 +--
 patches/@sharcoux+slider+8.0.4.patch | 13 -----
 yarn.lock                            | 73 +++-------------------------
 3 files changed, 8 insertions(+), 84 deletions(-)
 delete mode 100644 patches/@sharcoux+slider+8.0.4.patch

diff --git a/package.json b/package.json
index a9a421d7a..49ab87091 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@react-navigation/native": "^7.0.0",
     "@react-navigation/native-stack": "^7.0.0",
     "@sentry/react-native": "^6.1.0",
-    "@sharcoux/slider": "8.0.4",
+    "@sharcoux/slider": "8.0.5",
     "@shopify/flash-list": "^1.7.2",
     "@shopify/react-native-skia": "1.5.3",
     "axios": "^1.7.7",
@@ -124,9 +124,7 @@
     "zustand": "^5.0.1"
   },
   "resolutions": {
-    "metro": "^0.81.0",
-    "react-native@npm:*": "patch:react-native@npm%3A0.76.1#~/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch",
-    "@react-native/gradle-plugin@npm:0.76.1": "patch:@react-native/gradle-plugin@npm%3A0.76.1#~/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch"
+    "metro": "^0.81.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",
diff --git a/patches/@sharcoux+slider+8.0.4.patch b/patches/@sharcoux+slider+8.0.4.patch
deleted file mode 100644
index c4e908592..000000000
--- a/patches/@sharcoux+slider+8.0.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/@sharcoux/slider/dist/components/Thumb.js b/node_modules/@sharcoux/slider/dist/components/Thumb.js
-index 2aeee80..d7309c8 100644
---- a/node_modules/@sharcoux/slider/dist/components/Thumb.js
-+++ b/node_modules/@sharcoux/slider/dist/components/Thumb.js
-@@ -109,7 +109,7 @@ const Thumb = ({ color = 'darkcyan', CustomThumb, size = 15, thumbRadius = 0, st
-     });
-     const accessibilityValues = react_1.default.useMemo(() => ({ min: minimumValue, max: maximumValue, now: value }), [minimumValue, maximumValue, value]);
-     return react_1.default.createElement(RN.View, { style: containerStyle },
--        react_1.default.createElement(RN.View, { accessibilityActions: accessibility, onAccessibilityAction: accessibilityActions, focusable: true, accessible: true, accessibilityValue: accessibilityValues, accessibilityRole: 'adjustable', accessibilityLabel: thumb, 
-+        react_1.default.createElement(RN.View, { accessibilityActions: accessibility, onAccessibilityAction: accessibilityActions, focusable: true, accessible: true, accessibilityRole: 'adjustable', accessibilityLabel: thumb, 
-             // This is for web
-             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-             // @ts-ignore
diff --git a/yarn.lock b/yarn.lock
index 6d788a27b..de1e5421d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3260,13 +3260,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native/gradle-plugin@patch:@react-native/gradle-plugin@npm%3A0.76.1#~/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch":
-  version: 0.76.1
-  resolution: "@react-native/gradle-plugin@patch:@react-native/gradle-plugin@npm%3A0.76.1#~/.yarn/patches/@react-native-gradle-plugin-npm-0.76.1-f19c439d00.patch::version=0.76.1&hash=7825fa"
-  checksum: 10c0/5b870b5c2654252b2d2cbf90d9245824a60342f0e3342f2703300ded6e8496ee6712f205a503033f2ef1878432e034d7c0dab538e1b9fb37d36b9b9cbd068ae8
-  languageName: node
-  linkType: hard
-
 "@react-native/js-polyfills@npm:0.76.1":
   version: 0.76.1
   resolution: "@react-native/js-polyfills@npm:0.76.1"
@@ -3693,9 +3686,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sharcoux/slider@npm:8.0.4":
-  version: 8.0.4
-  resolution: "@sharcoux/slider@npm:8.0.4"
+"@sharcoux/slider@npm:8.0.5":
+  version: 8.0.5
+  resolution: "@sharcoux/slider@npm:8.0.5"
   dependencies:
     react-dom: "npm:>=16.13.1"
     react-native-web: "npm:>=0.13.4"
@@ -3707,7 +3700,7 @@ __metadata:
       optional: true
     react-native-web:
       optional: true
-  checksum: 10c0/1bad0604a2c636b28c6400828ed6b7d85094a8e387a42244735fa28f45e7adbe47d63860f1039f3441e82f4b609cce5a523e5d73a4443d4a9a22d40b7409377e
+  checksum: 10c0/f40cb0c90b87d3fea0420b7ccef4b3f26ba89e66028c7a5c07507ccdc35738f4b4261673fd12b44c8d7c9cb573b5ff222ec32f5e1e8e768f717227081bc81430
   languageName: node
   linkType: hard
 
@@ -5237,7 +5230,7 @@ __metadata:
     "@react-navigation/native": "npm:^7.0.0"
     "@react-navigation/native-stack": "npm:^7.0.0"
     "@sentry/react-native": "npm:^6.1.0"
-    "@sharcoux/slider": "npm:8.0.4"
+    "@sharcoux/slider": "npm:8.0.5"
     "@shopify/flash-list": "npm:^1.7.2"
     "@shopify/react-native-skia": "npm:1.5.3"
     "@tsconfig/react-native": "npm:^3.0.5"
@@ -14371,7 +14364,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native@npm:0.76.1, react-native@npm:^0.76.1":
+"react-native@npm:*, react-native@npm:^0.76.1":
   version: 0.76.1
   resolution: "react-native@npm:0.76.1"
   dependencies:
@@ -14425,60 +14418,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native@patch:react-native@npm%3A0.76.1#~/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch":
-  version: 0.76.1
-  resolution: "react-native@patch:react-native@npm%3A0.76.1#~/.yarn/patches/react-native-npm-0.76.1-c738a2fa39.patch::version=0.76.1&hash=df269a"
-  dependencies:
-    "@jest/create-cache-key-function": "npm:^29.6.3"
-    "@react-native/assets-registry": "npm:0.76.1"
-    "@react-native/codegen": "npm:0.76.1"
-    "@react-native/community-cli-plugin": "npm:0.76.1"
-    "@react-native/gradle-plugin": "npm:0.76.1"
-    "@react-native/js-polyfills": "npm:0.76.1"
-    "@react-native/normalize-colors": "npm:0.76.1"
-    "@react-native/virtualized-lists": "npm:0.76.1"
-    abort-controller: "npm:^3.0.0"
-    anser: "npm:^1.4.9"
-    ansi-regex: "npm:^5.0.0"
-    babel-jest: "npm:^29.7.0"
-    babel-plugin-syntax-hermes-parser: "npm:^0.23.1"
-    base64-js: "npm:^1.5.1"
-    chalk: "npm:^4.0.0"
-    commander: "npm:^12.0.0"
-    event-target-shim: "npm:^5.0.1"
-    flow-enums-runtime: "npm:^0.0.6"
-    glob: "npm:^7.1.1"
-    invariant: "npm:^2.2.4"
-    jest-environment-node: "npm:^29.6.3"
-    jsc-android: "npm:^250231.0.0"
-    memoize-one: "npm:^5.0.0"
-    metro-runtime: "npm:^0.81.0"
-    metro-source-map: "npm:^0.81.0"
-    mkdirp: "npm:^0.5.1"
-    nullthrows: "npm:^1.1.1"
-    pretty-format: "npm:^29.7.0"
-    promise: "npm:^8.3.0"
-    react-devtools-core: "npm:^5.3.1"
-    react-refresh: "npm:^0.14.0"
-    regenerator-runtime: "npm:^0.13.2"
-    scheduler: "npm:0.24.0-canary-efb381bbf-20230505"
-    semver: "npm:^7.1.3"
-    stacktrace-parser: "npm:^0.1.10"
-    whatwg-fetch: "npm:^3.0.0"
-    ws: "npm:^6.2.3"
-    yargs: "npm:^17.6.2"
-  peerDependencies:
-    "@types/react": ^18.2.6
-    react: ^18.2.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  bin:
-    react-native: cli.js
-  checksum: 10c0/1bc604586060450c02f434e2e9ea055e378640790c83d43a821b6c98d3638e951a88aabe82257a4eeaf21920cc7ec6958bd600e5d26554d5d6fd7eeab44af275
-  languageName: node
-  linkType: hard
-
 "react-reconciler@npm:0.27.0":
   version: 0.27.0
   resolution: "react-reconciler@npm:0.27.0"

From 443d21776f7065151387a287d22ff9360e2ab39f Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Wed, 13 Nov 2024 07:01:07 -0800
Subject: [PATCH 11/14] feat: billing

---
 src/components/billing/View.tsx | 23 ++++++++++++++++++-----
 src/hooks/useVIP.ts             |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/billing/View.tsx b/src/components/billing/View.tsx
index 934102642..a5659191d 100644
--- a/src/components/billing/View.tsx
+++ b/src/components/billing/View.tsx
@@ -1,13 +1,13 @@
-import { View } from 'react-native';
+import { View, StyleSheet } from 'react-native';
 import React, { useState } from 'react';
 import { Text, Button, ActivityIndicator } from 'react-native-paper';
 import { useTranslation } from 'react-i18next';
 import { Image } from 'expo-image';
 import Purchases from 'react-native-purchases';
 
-import useVIP, { checkGuardVIP } from '@hooks/useVIP';
+import useVIP, { checkGuardVIP, purchaseVIP } from '@hooks/useVIP';
 import { styles } from '../style';
-import { StyleSheet } from 'react-native';
+import logger from '@utils/Logger';
 
 interface LoadingChildrenProps {
   setLoading: React.Dispatch<React.SetStateAction<boolean>>;
@@ -41,9 +41,22 @@ const RevenueCatVIP = ({ setLoading }: LoadingChildrenProps) => {
   const checkRevenueCatVIP = async () => {
     setLoading(true);
     try {
-      console.log('purhcase', await Purchases.getOfferings());
+      const offerings = await Purchases.getOfferings();
+      if (
+        offerings.current !== null &&
+        offerings.current.availablePackages.length !== 0
+      ) {
+        const { customerInfo } = await Purchases.purchasePackage(
+          offerings.current.availablePackages[0],
+        );
+        if (
+          typeof customerInfo.entitlements.active['apm-pro'] !== 'undefined'
+        ) {
+          purchaseVIP();
+        }
+      }
     } catch (e) {
-      console.error(JSON.stringify(e));
+      logger.error(JSON.stringify(e));
     }
     setLoading(false);
   };
diff --git a/src/hooks/useVIP.ts b/src/hooks/useVIP.ts
index c857661a1..e0b5147d8 100644
--- a/src/hooks/useVIP.ts
+++ b/src/hooks/useVIP.ts
@@ -33,7 +33,7 @@ export const checkVIP = async () => {
   }
 };
 
-const purchaseVIP = (type = VIPType.RevenueCat) => {
+export const purchaseVIP = (type = VIPType.RevenueCat) => {
   SecureStore.setItemAsync(VIPKey, type);
   useVIP.setState({ VIP: true });
 };

From b5b0da7260b6a756961cd0482fff1d3c466a4683 Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Wed, 13 Nov 2024 07:01:59 -0800
Subject: [PATCH 12/14] chore: yarn dep

---
 package.json |  4 ++--
 yarn.lock    | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 49ab87091..70467b991 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "deepmerge": "^4.3.1",
     "dropbox": "git+https://lovegaoshi@github.com/lovegaoshi/dropbox-sdk-js.git",
     "event-target-polyfill": "^0.0.4",
-    "expo": "^52.0.3",
+    "expo": "^52.0.4",
     "expo-auth-session": "~6.0.0",
     "expo-clipboard": "~7.0.0",
     "expo-crypto": "~14.0.1",
@@ -107,7 +107,7 @@
     "react-native-screens": "4.0.0",
     "react-native-shadow-2": "^7.1.1",
     "react-native-share-menu": "git+https://github.com/Expensify/react-native-share-menu.git",
-    "react-native-svg": "15.8.0",
+    "react-native-svg": "15.9.0",
     "react-native-svga-player": "https://lovegaoshi@github.com/lovegaoshi/react-native-svga-player.git#commit=f8c6303fddb528a1a94d2ab4696c9318c0002cfd",
     "react-native-text-ticker": "https://lovegaoshi@github.com/lovegaoshi/react-native-text-ticker.git#commit=b9eb454b18bb621a769ce4b57b4603a81501b477",
     "react-native-track-player": "https://github.com/lovegaoshi/react-native-track-player.git#commit=6142378143e43cf28b74940195b1def6e0ec795d",
diff --git a/yarn.lock b/yarn.lock
index de1e5421d..569de3fdc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1783,9 +1783,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/cli@npm:0.21.0":
-  version: 0.21.0
-  resolution: "@expo/cli@npm:0.21.0"
+"@expo/cli@npm:0.21.1":
+  version: 0.21.1
+  resolution: "@expo/cli@npm:0.21.1"
   dependencies:
     "@0no-co/graphql.web": "npm:^1.0.8"
     "@babel/runtime": "npm:^7.20.0"
@@ -1860,7 +1860,7 @@ __metadata:
     ws: "npm:^8.12.1"
   bin:
     expo-internal: build/bin/cli
-  checksum: 10c0/2d5d1653befad468915671b1554473bc25ebc5f636c2614541e5278b46e87119a69b54db56d436b1630e84f46cf47d4e84aa2ffcbe4a1bc2e390e2b53375e179
+  checksum: 10c0/2e4269ef24d39203763484ac724afb8355dddfe65e2f2dc3fd31e9dd73f6eac773ea89207c67ba7e12b0d63a5732a771dd3e715a2ddd472adf5d18b13b87bf5f
   languageName: node
   linkType: hard
 
@@ -2056,9 +2056,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/metro-config@npm:0.19.1":
-  version: 0.19.1
-  resolution: "@expo/metro-config@npm:0.19.1"
+"@expo/metro-config@npm:0.19.2":
+  version: 0.19.2
+  resolution: "@expo/metro-config@npm:0.19.2"
   dependencies:
     "@babel/core": "npm:^7.20.0"
     "@babel/generator": "npm:^7.20.5"
@@ -2078,7 +2078,7 @@ __metadata:
     minimatch: "npm:^3.0.4"
     postcss: "npm:~8.4.32"
     resolve-from: "npm:^5.0.0"
-  checksum: 10c0/b0e062f19b2b366af4c461d2d9f61740643e32e391ae6e8c4568ae7b5b831174d2232d2119b14eff4f62b215e0f2690983a4d1634c0134797d4344f48d471c41
+  checksum: 10c0/9ff5da6bd33aed0c6cf7564ea42aaa17a9d8b6f00cf52ede0a4bdf4bf0dc47dad53e94b9beb43b2f10f221178d7317d9f972b56c5a1659722596637b495a957c
   languageName: node
   linkType: hard
 
@@ -5278,7 +5278,7 @@ __metadata:
     eslint-plugin-react: "npm:^7.37.2"
     eslint-plugin-react-hooks: "npm:^5.0.0"
     event-target-polyfill: "npm:^0.0.4"
-    expo: "npm:^52.0.3"
+    expo: "npm:^52.0.4"
     expo-auth-session: "npm:~6.0.0"
     expo-clipboard: "npm:~7.0.0"
     expo-crypto: "npm:~14.0.1"
@@ -5330,7 +5330,7 @@ __metadata:
     react-native-screens: "npm:4.0.0"
     react-native-shadow-2: "npm:^7.1.1"
     react-native-share-menu: "git+https://github.com/Expensify/react-native-share-menu.git"
-    react-native-svg: "npm:15.8.0"
+    react-native-svg: "npm:15.9.0"
     react-native-svga-player: "https://lovegaoshi@github.com/lovegaoshi/react-native-svga-player.git#commit=f8c6303fddb528a1a94d2ab4696c9318c0002cfd"
     react-native-text-ticker: "https://lovegaoshi@github.com/lovegaoshi/react-native-text-ticker.git#commit=b9eb454b18bb621a769ce4b57b4603a81501b477"
     react-native-track-player: "https://github.com/lovegaoshi/react-native-track-player.git#commit=6142378143e43cf28b74940195b1def6e0ec795d"
@@ -8476,9 +8476,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo-modules-autolinking@npm:2.0.0":
-  version: 2.0.0
-  resolution: "expo-modules-autolinking@npm:2.0.0"
+"expo-modules-autolinking@npm:2.0.1":
+  version: 2.0.1
+  resolution: "expo-modules-autolinking@npm:2.0.1"
   dependencies:
     "@expo/spawn-async": "npm:^1.7.2"
     chalk: "npm:^4.1.0"
@@ -8490,7 +8490,7 @@ __metadata:
     resolve-from: "npm:^5.0.0"
   bin:
     expo-modules-autolinking: bin/expo-modules-autolinking.js
-  checksum: 10c0/5bd114c080f08013839a40c86abfc1e46c594678da3955f1310d2732675e2105b5f727fa890ae9704e35936f3ea2db2e16d0d6c1e826211c9585b4be5209891b
+  checksum: 10c0/c9a376677688d3de4fec52fa47c04212cb0303a058020bdb7d05b910e4520d910b06d40889bc1c91500968dea087cca8d21ec9dd207b9232ca2ef7fa25774173
   languageName: node
   linkType: hard
 
@@ -8522,16 +8522,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo@npm:^52.0.3":
-  version: 52.0.3
-  resolution: "expo@npm:52.0.3"
+"expo@npm:^52.0.4":
+  version: 52.0.4
+  resolution: "expo@npm:52.0.4"
   dependencies:
     "@babel/runtime": "npm:^7.20.0"
-    "@expo/cli": "npm:0.21.0"
+    "@expo/cli": "npm:0.21.1"
     "@expo/config": "npm:10.0.3"
     "@expo/config-plugins": "npm:9.0.9"
     "@expo/fingerprint": "npm:0.11.2"
-    "@expo/metro-config": "npm:0.19.1"
+    "@expo/metro-config": "npm:0.19.2"
     "@expo/vector-icons": "npm:^14.0.0"
     babel-preset-expo: "npm:~12.0.0"
     expo-asset: "npm:~11.0.1"
@@ -8539,7 +8539,7 @@ __metadata:
     expo-file-system: "npm:~18.0.2"
     expo-font: "npm:~13.0.1"
     expo-keep-awake: "npm:~14.0.1"
-    expo-modules-autolinking: "npm:2.0.0"
+    expo-modules-autolinking: "npm:2.0.1"
     expo-modules-core: "npm:2.0.1"
     fbemitter: "npm:^3.0.0"
     web-streams-polyfill: "npm:^3.3.2"
@@ -8559,7 +8559,7 @@ __metadata:
       optional: true
   bin:
     expo: bin/cli
-  checksum: 10c0/5f338389650d58483482655c240ce91d84ce767658aed31d24f8b32064eb947f68065035a75fe5828822c756540dca02affc93e1753dc2a759c2997f9d9e528d
+  checksum: 10c0/bd587f584f4facc7941f8b20cafcc6b3b57c0bef0080dff740243e05ed68fe971a41d72f257527bedc7a2de13602c481ca8e2e58022b57a46a94e0a51708d3ea
   languageName: node
   linkType: hard
 
@@ -14231,9 +14231,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-svg@npm:15.8.0":
-  version: 15.8.0
-  resolution: "react-native-svg@npm:15.8.0"
+"react-native-svg@npm:15.9.0":
+  version: 15.9.0
+  resolution: "react-native-svg@npm:15.9.0"
   dependencies:
     css-select: "npm:^5.1.0"
     css-tree: "npm:^1.1.3"
@@ -14241,7 +14241,7 @@ __metadata:
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 10c0/03d2cb19c799da6ba41dea0dc414338d01a55549ea4e4a370315c8ec34e1c6de430a62b538f099423060edc8bea6df134f765bde862770059404617c3c296af8
+  checksum: 10c0/b255528644756aa1bd9193746a25b2d48d501b9620d7b9291816235fe263ac909e535e6e3485c6039cadc040c83209f48e5cc522b93aef8c23839b6f8576c9b2
   languageName: node
   linkType: hard
 

From 9d95156cb9fb630a785a4e54c4520a56f2569052 Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Wed, 13 Nov 2024 07:12:07 -0800
Subject: [PATCH 13/14] fix: refresh throttle

---
 src/services/PlaybackService.ts | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/services/PlaybackService.ts b/src/services/PlaybackService.ts
index d55e7d9d5..60f3bce02 100644
--- a/src/services/PlaybackService.ts
+++ b/src/services/PlaybackService.ts
@@ -28,8 +28,22 @@ const { APMWidgetModule } = NativeModules;
 const { getState } = noxPlayingList;
 const { setState } = appStore;
 const getAppStoreState = appStore.getState;
-let lastBiliHeartBeat: string[] = ['', ''];
+const lastBiliHeartBeat: string[] = ['', ''];
 const lastPlayedDuration: { val?: number } = { val: 0 };
+const refetchThrottleGuard: [string, number] = ['null', 0];
+
+const refreshThrottle = (
+  song: NoxMedia.Song,
+  timestamp: number,
+  currTime = new Date().getTime(),
+) => {
+  if (song.id === refetchThrottleGuard[0] && currTime - timestamp < 10000) {
+    return false;
+  }
+  refetchThrottleGuard[0] = song.id;
+  refetchThrottleGuard[1] = currTime;
+  return true;
+};
 
 export async function additionalPlaybackService({
   noInterruption = false,
@@ -169,11 +183,18 @@ export async function PlaybackService() {
           bvid: event.track.song.bvid,
           cid: event.track.song.id,
         });
-        lastBiliHeartBeat = heartBeatReq;
+        lastBiliHeartBeat[0] = heartBeatReq[0];
+        lastBiliHeartBeat[1] = heartBeatReq[1];
       }
+      const currTime = new Date().getTime();
       if (
         event.index !== undefined &&
-        new Date().getTime() - event.track.urlRefreshTimeStamp > 3600000
+        currTime - event.track.urlRefreshTimeStamp > 3600000 &&
+        refreshThrottle(
+          event.track.song,
+          event.track.urlRefreshTimeStamp,
+          currTime,
+        )
       ) {
         try {
           logger.debug(`[ResolveURL] re-resolving track ${event.track?.title}`);
@@ -183,7 +204,7 @@ export async function PlaybackService() {
           await TrackPlayer.load({
             ...currentTrack,
             ...updatedMetadata,
-            urlRefreshTimeStamp: new Date().getTime(),
+            urlRefreshTimeStamp: currTime,
           });
           if (playerErrored) {
             TrackPlayer.play();

From 44d0ed666559897bd34f21dce79e3fefc9032f50 Mon Sep 17 00:00:00 2001
From: lovegaoshi <106490582+lovegaoshi@users.noreply.github.com>
Date: Wed, 13 Nov 2024 07:13:08 -0800
Subject: [PATCH 14/14] fix: lint

---
 src/hooks/useVIP.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useVIP.ts b/src/hooks/useVIP.ts
index e0b5147d8..1a86f9452 100644
--- a/src/hooks/useVIP.ts
+++ b/src/hooks/useVIP.ts
@@ -46,7 +46,7 @@ const loseVIP = () => {
 interface VIPStore {
   VIP: boolean;
 }
-const useVIP = create<VIPStore>((set, get) => ({
+const useVIP = create<VIPStore>(() => ({
   VIP: SecureStore.getItem(VIPKey) !== null,
 }));