Merge branch 'main' into fix/large-screen-support

README-de.md

@@ -57,15 +57,13 @@ Nachfolgend sind die bisher erzielten Fortschritte und die Ziele aufgeführt, an
 - [ ] Android Widget
 - [ ] ...
 
-[Was mache ich gerade?](https://github.com/users/Ashinch/projects/2)
-
 ## Integration
 
 **Read You** ist mit einigen APIs von Drittanbietern kompatibel, um bei der Nutzung Ihrer bestehenden Cloud-Konten als Datenquellen zu unterstützen.
 
 - [x] Fever
-- [ ] Google Reader
-- [ ] FreshRSS
+- [x] Google Reader
+- [x] FreshRSS
 - [ ] Miniflux
 - [ ] Tiny Tiny RSS
 - [ ] Inoreader
@@ -85,6 +83,18 @@ Nachfolgend sind die bisher erzielten Fortschritte und die Ziele aufgeführt, an
 
 F-Droid-Versionen können nicht auf andere Versionen aktualisiert werden und werden kompiliert, signiert und einheitlich verteilt von [F-Droid](https://f-droid.org/docs/FAQ_-_General/).
 
+## Nightly
+
+Wir bieten Nightly-Versionen zu Testzwecken an. Diese Versionen enthalten die neuesten Funktionen und Verbesserungen, sind jedoch möglicherweise nicht so stabil wie unsere regulären Versionen. Bitte beachten Sie, dass Nightly-Builds möglicherweise Fehler enthalten und nicht für den täglichen Gebrauch empfohlen werden.
+
+Sie können die Nightly-Version über den folgenden Link herunterladen:
+
+<a target="_blank" href="https://github.com/Ashinch/ReadYou/actions/workflows/build_commit.yaml">Nightly-Builds überprüfen</a>
+
+Wählen Sie den neuesten Workflow auf der GitHub Actions-Seite aus und laden Sie die Artefakte von der Zusammenfassungsseite des Workflows herunter (Es ist möglicherweise erforderlich, sich bei GitHub anzumelden).
+
+**Denken Sie daran, Ihre Daten vor dem Ausprobieren der Nightly-Version zur Sicherheit zu sichern, falls Probleme auftreten.**
+
 ## Spenden
 
 **Read You** ist eine kostenlose Open-Source-Software, die von der Open-Source-Gemeinschaft profitiert, und jeder Benutzer kann ihre volle Funktionalität kostenlos genießen. Wenn Sie also meine aktuelle Arbeit wertschätzen, können Sie mir gerne eine Tasse Kaffee spendieren ☕️.

README-zh-CN.md

@@ -46,24 +46,22 @@
 
 - [x] 订阅 RSS 链接
 - [x] 导入 / 导出 OPML 文件
-- [x] 文章更新通知
-- [x] 沉浸阅读（文章内容去干扰优化）
+- [x] 新文章通知
+- [x] 可读性优化（截取文章正文内容）
 - [x] 全文解析
 - [x] 支持多账户
 - [ ] 仿生阅读
 - [ ] 大声朗读
 - [ ] Android 微件 / 小组件
 - [ ] ...
 
-[我目前在做什么？](https://github.com/users/Ashinch/projects/2)
-
 ## 集成
 
 **Read You** 也集成了一些第三方服务 API，支持您使用已有的云端账户来作为数据源。
 
 - [x] Fever
-- [ ] Google Reader
-- [ ] FreshRSS
+- [x] Google Reader
+- [x] FreshRSS
 - [ ] Miniflux
 - [ ] Tiny Tiny RSS
 - [ ] Inoreader
@@ -83,6 +81,16 @@
 
 F-Droid 版本与其他版本不兼容，您无法通过覆盖安装包来升级、切换至其他版本，需要卸载后再重新安装，届时所有本地数据将被清除。整个应用的编译、签名和分发均由 [F-Droid](https://f-droid.org/docs/FAQ_-_General/) 统一完成。
 
+## 夜间构建
+
+我们提供夜间构建用于测试目的，这些版本包含最新的功能和改进，但可能不如常规版本稳定。请注意，夜间版本可能存在 bug，并且不建议日常使用。
+
+<a target="_blank" href="https://github.com/Ashinch/ReadYou/actions/workflows/build_commit.yaml">检查夜间构建</a>
+
+从 GitHub Actions 页面选择最新的 workflow，并从该 workflow 的摘要页面下载构建文件（您可能需要登录 GitHub）。
+
+**在尝试夜间版本之前，请备份好您的数据。**
+
 ## 捐赠
 
 **Read You** 是一款免费的自由开源软件，它受益于开源社区，每一位用户都能够免费享受到它完整的功能，如果您赞赏我目前的工作，可以选择请我喝一杯咖啡 ☕️。

README.md

@@ -57,15 +57,13 @@ The following are the progress made so far and the goals to be worked on in the
 - [ ] Android widget
 - [ ] ...
 
-[What am I doing now?](https://github.com/users/Ashinch/projects/2)
-
 ## Integration
 
 **Read You** integrates with some of third-party service APIs to support you in using your existing cloud accounts as data sources.
 
 - [x] Fever
-- [ ] Google Reader
-- [ ] FreshRSS
+- [x] Google Reader
+- [x] FreshRSS
 - [ ] Miniflux
 - [ ] Tiny Tiny RSS
 - [ ] Inoreader
@@ -85,6 +83,18 @@ The following are the progress made so far and the goals to be worked on in the
 
 F-Droid releases can not upgrade to other releases and it is compiled, signed and distributed uniformly by [F-Droid](https://f-droid.org/docs/FAQ_-_General/).
 
+## Nightly
+
+We offer Nightly versions for testing purposes. These versions include the latest features and improvements but may not be as stable as our regular releases. Please note that Nightly builds might have bugs and are not recommended for everyday use.
+
+You can download the Nightly version from the following link:
+
+<a target="_blank" href="https://github.com/Ashinch/ReadYou/actions/workflows/build_commit.yaml">Check Nightly Builds</a>
+
+Choose the latest workflow from the GitHub Actions page and download the artifacts from the workflow's summary page (You may require logging in to GitHub).
+
+**Remember to back up your data before trying the Nightly version in case of any issues.**
+
 ## Sponsor
 
 **Read You** is a free open source software that benefits from the open source community and every user can enjoy it's full functionality for free, so if you appreciate my current work, you can buy me a cup of coffee ☕️.

app/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id "org.jetbrains.kotlin.android"
     id "kotlin-kapt"
     id "dagger.hilt.android.plugin"
-    id "androidx.navigation.safeargs.kotlin"
+    id "com.google.dagger.hilt.android"
 }
 
 def gitCommitHash = "git rev-parse --verify --short HEAD".execute().text.trim()
@@ -15,14 +15,14 @@ if (keyPropsFile.exists()) {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "me.ash.reader"
         minSdk 26
         targetSdk 33
-        versionCode 22
-        versionName "0.9.11"
+        versionCode 23
+        versionName "0.9.12"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -60,6 +60,9 @@ android {
             storePassword keyProps["storePassword"]
         }
     }
+    lint {
+        disable.addAll("MissingTranslation", "ExtraTranslation")
+    }
     buildTypes {
         release {
             minifyEnabled true
@@ -87,13 +90,19 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose
+        kotlinCompilerExtensionVersion '1.5.8'
     }
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+
+//    https://developer.android.com/guide/topics/resources/app-languages#auto-localeconfig
+    androidResources {
+        generateLocaleConfig true
+    }
+
     namespace 'me.ash.reader'
 }
 
@@ -118,6 +127,9 @@ dependencies {
     implementation("io.coil-kt:coil-svg:$coil")
     implementation("io.coil-kt:coil-gif:$coil")
 
+    // https://saket.github.io/telephoto/zoomableimage/
+    implementation("me.saket.telephoto:zoomable:0.7.1")
+
     // Cancel TLSv1.3 support pre Android10
     // implementation 'org.conscrypt:conscrypt-android:2.5.2'
 
@@ -162,36 +174,40 @@ dependencies {
     implementation "androidx.compose.material3:material3-window-size-class:$material3"
 
     // https://github.com/google/accompanist/releases
-    implementation "com.google.accompanist:accompanist-insets:$accompanist"
     implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist"
     implementation "com.google.accompanist:accompanist-pager:$accompanist"
     implementation "com.google.accompanist:accompanist-flowlayout:$accompanist"
     implementation "com.google.accompanist:accompanist-navigation-animation:$accompanist"
     implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist"
 
+    implementation platform("androidx.compose:compose-bom:$composeBom")
+    androidTestImplementation(platform("androidx.compose:compose-bom:$composeBom"))
+
     // https://developer.android.com/jetpack/androidx/releases/compose-animation
-    implementation "androidx.compose.animation:animation-graphics:$compose"
+    implementation "androidx.compose.animation:animation-graphics"
     // https://developer.android.com/jetpack/androidx/releases/compose-ui
-    implementation "androidx.compose.ui:ui:$compose"
-    implementation "androidx.compose.ui:ui-util:$compose"
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.ui:ui-util"
     // https://developer.android.com/jetpack/androidx/releases/compose-material
-    implementation "androidx.compose.material:material:$compose"
-    implementation "androidx.compose.material:material-icons-extended:$compose"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose"
+    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.material:material-icons-extended"
+    implementation "androidx.compose.ui:ui-tooling"
+    implementation "androidx.compose.ui:ui-tooling-preview"
+
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4"
 
     // hilt
-    implementation "androidx.hilt:hilt-work:1.0.0"
-    implementation "com.google.dagger:hilt-android:2.40.5"
-    kapt "com.google.dagger:hilt-android-compiler:2.40.5"
-    implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
-    kapt "androidx.hilt:hilt-compiler:1.0.0"
-    implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
+    implementation "androidx.hilt:hilt-work:1.1.0"
+    implementation "com.google.dagger:hilt-android:2.50"
+    kapt "com.google.dagger:hilt-android-compiler:2.50"
+//    implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
+    kapt "androidx.hilt:hilt-compiler:1.1.0"
+    implementation "androidx.hilt:hilt-navigation-compose:1.1.0"
 
     // android
-    implementation "androidx.core:core-ktx:1.7.0"
-    implementation "androidx.activity:activity-compose:1.4.0"
+    implementation "androidx.core:core-ktx:1.12.0"
+    implementation "androidx.activity:activity-compose:1.8.2"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"

app/proguard-rules.pro

@@ -36,3 +36,9 @@
 
 # Provider API
 -keep class me.ash.reader.infrastructure.** { *; }
+
+# https://github.com/flutter/flutter/issues/127388
+-dontwarn org.kxml2.io.KXml**
+
+# https://youtrack.jetbrains.com/issue/KTOR-5528
+-dontwarn org.slf4j.impl.StaticLoggerBinder

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <queries>
         <intent>
@@ -34,6 +34,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".infrastructure.android.CrashReportActivity"
+            android:exported="false"
+            android:theme="@style/Theme.Reader">
+        </activity>
 
         <provider
             android:name="androidx.startup.InitializationProvider"
@@ -49,6 +54,15 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
     </application>
 
 </manifest>