Merge branch 'release/v1.3.0'

Author: darriousliu

.github/README-en.md

@@ -21,7 +21,7 @@ by [Jetpack Compose](https://developer.android.com/develop/ui/compose)
 [![GitHub downloads](https://img.shields.io/github/downloads/master-lzh/PiPixiv/total?label=downloads&labelColor=27303D&color=0D1117&logo=github&logoColor=FFFFFF&style=flat)](https://github.com/master-lzh/PiPixiv/releases)
 [![F-Droid Version](https://img.shields.io/f-droid/v/com.mrl.pixiv)](https://f-droid.org/packages/com.mrl.pixiv/)
 
-### Supports **[Android 6.0]()** or higher
+### Supports **[Android 8.0]()** or higher
 
 ## Features
 
@@ -30,29 +30,20 @@ by [Jetpack Compose](https://developer.android.com/develop/ui/compose)
 * Log in using a Pixiv account.
 * Homepage recommended illustrations.
 * Search illustrations and sort by popularity, latest, etc.
+* View rankings (Daily, Weekly, Monthly, etc.).
 * Bookmark illustrations/Follow artists.
+* View browsing history.
 * View illustration details and recommended illustrations.
-* Long press on an image to download the original illustration.
+* Long press on an image to download the original illustration or GIF.
+* App settings (Language, Network, Feature Switch, etc.).
+* Deep link support.
+* Block illustrations and users.
 
 ### To-do List
 
 * **Features and PRs are welcome**
 * More...
 
-### v1.1.0
-
-- [x] Refactor the network layer, replacing OkHttp with Ktor
-- [x] Refactor datastore to MMKV
-- [x] Refactor some global states into a singleton pattern for code simplification and easier
-  dependency injection
-- [x] Adapt new navigation
-- [x] Settings page
-- [x] Favourites page
-- [x] Followed page
-- [x] History page
-- [x] Translation
-- [x] Deep link support (open from https://www.pixiv.net/illust/xxxxxx)
-
 </div>
 
 ## App Preview
@@ -82,4 +73,4 @@ This project uses or references several open-source projects:
 
 </div>
 
-</div>
+</div>

.github/workflows/develop.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Java
         uses: actions/setup-java@v5

.github/workflows/fastlane.yml

@@ -11,6 +11,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Validate Fastlane Supply Metadata
         uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Java
         uses: actions/setup-java@v5

.gitignore

@@ -18,4 +18,7 @@ local.properties
 /.kotlin/
 /app/default
 /app/foss
-*.base64.txt
+*.base64.txt
+GEMINI.md
+CLAUDE.md
+AGENTS.md

README.md

@@ -22,7 +22,7 @@
 [![GitHub downloads](https://img.shields.io/github/downloads/master-lzh/PiPixiv/total?label=下载量&labelColor=27303D&color=0D1117&logo=github&logoColor=FFFFFF&style=flat)](https://github.com/master-lzh/PiPixiv/releases)
 [![F-Droid Version](https://img.shields.io/f-droid/v/com.mrl.pixiv)](https://f-droid.org/packages/com.mrl.pixiv/)
 
-### 支持 **[Android 6.0]()** 或更高版本
+### 支持 **[Android 8.0]()** 或更高版本
 
 ## 功能
 
@@ -31,28 +31,20 @@
 * 使用 Pixiv 账号登录。
 * 首页推荐插图。
 * 搜索插图，按照人气、最新等排序。
+* 查看排行榜（日榜、周榜、月榜等）。
 * 收藏插图/关注作者。
+* 查看浏览历史。
 * 查看插图详情和推荐插图。
-* 长按图片下载原始插图。
+* 长按图片下载原始插图或GIF。
+* 应用设置（语言、网络、功能开关等）。
+* 深度链接支持。
+* 屏蔽作品和用户。
 
 ### 待办事项
 
 * **欢迎提出Feature和PR**
 * 更多...
 
-### v1.1.0
-
-- [x] 重构网络层，将OkHttp换成Ktor
-- [x] 重构datastore为MMKV
-- [x] 将一些全局状态重构成单例模式，简化代码，便于依赖注入
-- [x] 适配新的导航
-- [x] 设置页面
-- [x] 收藏页面
-- [x] 关注页面
-- [x] 历史页面
-- [x] 英文翻译
-- [x] 深度链接支持（从 https://www.pixiv.net/illust/xxxxxx 打开）
-
 </div>
 
 ## 应用预览

app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
 
     defaultConfig {
         applicationId = "com.mrl.pixiv"
-        versionCode = 10201
-        versionName = "1.2.1"
+        versionCode = 10300
+        versionName = "1.3.0"
 
         vectorDrawables {
             useSupportLibrary = true
@@ -95,9 +95,26 @@ android {
 }
 
 dependencies {
-    implementation(project(":lib_common"))
-    implementation(project(":lib_feature"))
-
     baselineProfile(project(":baselineprofile"))
-    ksp(libs.koin.ksp.compiler)
+    implementation(project(":common:data"))
+    implementation(project(":common:network"))
+    implementation(project(":common:repository"))
+    implementation(project(":common:ui"))
+    implementation(project(":common:core"))
+    rootDir.resolve("feature").listFiles()?.filter { it.isDirectory }?.forEach {
+        implementation(project(":feature:${it.name}"))
+    }
+
+    // splash screen
+    implementation(androidx.splashscreen)
+    // ProfileInstaller
+    implementation(androidx.profileinstaller)
+    // Navigation3
+    api(compose.bundles.navigation3)
+    // Coil3
+    implementation(platform(libs.coil3.bom))
+    implementation(libs.bundles.coil3)
+    // MMKV
+    implementation(libs.mmkv)
+    implementation(libs.mmkv.kotlin)
 }

app/src/main/AndroidManifest.xml

@@ -6,6 +6,12 @@
     <uses-permission android:name="android.permission.INTERNET" /> <!-- 读写权限 -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+    <uses-permission
+            android:name="android.permission.READ_EXTERNAL_STORAGE"
+            android:maxSdkVersion="32" />
+    <uses-permission
+            android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+            android:maxSdkVersion="28" />
 
     <application
         android:name=".App"

app/src/main/kotlin/com/mrl/pixiv/di/DiModule.kt

@@ -1,12 +1,10 @@
 package com.mrl.pixiv.di
 
 import com.mrl.pixiv.AppModule
-import com.mrl.pixiv.FeatureModule
 import com.mrl.pixiv.common.CommonModule
 import org.koin.ksp.generated.module
 
 val allModule = listOf(
     AppModule.module,
     CommonModule.module,
-    FeatureModule.module,
 )