Merge branch 'master' into beta

# Conflicts:
#	package-lock.json
#	package.json

.ncurc.js

@@ -1,12 +1,16 @@
 module.exports = {
   upgrade: true,
   reject: [
-    'react-native-navigation',
     '@types/react-native',
     'message2call',
     'react',
   ],
 
+  // target: 'newest',
+  // filter: [
+  //   'react-native-navigation',
+  // ],
+
   // target: 'patch',
   // filter: [
   //   '@types/react-native',

CHANGELOG.md

@@ -6,6 +6,30 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [1.3.0](https://github.com/lyswhut/lx-music-mobile/compare/v1.2.0...v1.3.0) - 2024-04-14
+
+### 新增
+
+- 新增棕色主题“泥牛入海”
+- 新增设置-基本设置-总是保留状态栏高度设置，如果在你的设备上出现软件可交互内容与状态栏内容显示重叠的情况，可以启用该设置以始终为系统状态栏保留空间
+- 新增在线自定义源导入功能，允许通过http/https链接导入自定义源
+
+### 优化
+
+- 不再丢弃kg源逐行歌词（@helloplhm-qwq）
+- 支持kw源排行榜显示大小（revert @Folltoshe #1460）
+- 优化本地歌曲换源匹配机制
+
+### 修复
+
+- 修复mg歌词在某些情况下获取失败的问题
+- 修复mg歌单搜索（@helloplhm-qwq）
+- 修复kg最新评论无法获取的问题（@helloplhm-qwq）
+
+### 其他
+
+- 更新 React native 到 v0.73.6
+
 ## [1.2.0](https://github.com/lyswhut/lx-music-mobile/compare/v1.1.1...v1.2.0) - 2024-02-01
 
 提前祝大家新年快乐！

README.md

@@ -21,7 +21,7 @@
 
 - Android
 
-注：不计划支持IOS
+注：由于没有相关开发环境及证书，所以不计划支持IOS
 
 软件变化请查看：[更新日志](https://github.com/lyswhut/lx-music-mobile/blob/master/CHANGELOG.md)<br>
 软件下载请转到：[发布页面](https://github.com/lyswhut/lx-music-mobile/releases)<br>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lx-music-mobile",
   "version": "8.8.8",
-  "versionCode": 63,
+  "versionCode": 88,
   "private": true,
   "scripts": {
     "dev": "react-native run-android --active-arch-only",
@@ -44,9 +44,9 @@
   "homepage": "https://github.com/lyswhut/lx-music-mobile#readme",
   "dependencies": {
     "@craftzdog/react-native-buffer": "^6.0.5",
-    "@react-native-async-storage/async-storage": "^1.22.3",
-    "@react-native-clipboard/clipboard": "^1.13.2",
-    "@react-native-community/slider": "^4.5.0",
+    "@react-native-async-storage/async-storage": "^1.23.1",
+    "@react-native-clipboard/clipboard": "^1.14.0",
+    "@react-native-community/slider": "^4.5.2",
     "iconv-lite": "^0.6.3",
     "lrc-file-parser": "^2.4.1",
     "message2call": "^0.1.3",
@@ -59,25 +59,24 @@
     "react-native-file-system": "github:lyswhut/react-native-file-system#cb3b807ac68c5cdb2c32ca10fdbb5e5209154ece",
     "react-native-fs": "^2.20.0",
     "react-native-local-media-metadata": "github:lyswhut/react-native-local-media-metadata#c8377d82c04aecf5ee79d446276ab9d0c1f167be",
-    "react-native-navigation": "^7.38.1",
-    "react-native-pager-view": "^6.2.3",
-    "react-native-quick-base64": "^2.0.8",
+    "react-native-navigation": "^7.39.1",
+    "react-native-pager-view": "^6.3.0",
+    "react-native-quick-base64": "^2.1.1",
     "react-native-quick-md5": "^3.0.6",
-    "react-native-track-player": "github:lyswhut/react-native-track-player#ddfb984ec12efb0d6ae84c924e027f872bb1481f",
-    "react-native-vector-icons": "^10.0.3",
-    "rn-fetch-blob": "^0.12.0"
+    "react-native-track-player": "github:lyswhut/react-native-track-player#f969fbb5d6fb132100d079eb5f7da701d2ce2780",
+    "react-native-vector-icons": "^10.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.0",
-    "@babel/eslint-parser": "^7.23.10",
+    "@babel/core": "^7.24.4",
+    "@babel/eslint-parser": "^7.24.1",
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-    "@babel/preset-env": "^7.24.0",
-    "@babel/runtime": "^7.24.0",
-    "@react-native/babel-preset": "^0.74.0",
-    "@react-native/metro-config": "^0.73.5",
-    "@react-native/typescript-config": "^0.74.0",
-    "@tsconfig/react-native": "^3.0.3",
-    "@types/react": "^18.2.66",
+    "@babel/preset-env": "^7.24.4",
+    "@babel/runtime": "^7.24.4",
+    "@react-native/babel-preset": "^0.74.79",
+    "@react-native/metro-config": "^0.74.79",
+    "@react-native/typescript-config": "^0.74.79",
+    "@tsconfig/react-native": "^3.0.5",
+    "@types/react": "^18.2.78",
     "@types/react-native": "^0.72.8",
     "@types/react-native-background-timer": "^2.0.2",
     "@types/react-native-vector-icons": "^6.4.18",
@@ -87,6 +86,6 @@
     "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.5"
   }
-}
+}