Upstream tag 0.10.1 (revision 48438e7)

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: ['https://www.buymeacoffee.com/ashinch', 'https://afdian.net/a/ashinch']
+custom: ['https://afdian.net/a/ashinch']
+github: [junkfood02]

README-de.md

@@ -99,7 +99,7 @@ Wählen Sie den neuesten Workflow auf der GitHub Actions-Seite aus und laden Sie
 
 **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 ☕️.
 
-<a href="https://www.buymeacoffee.com/ashinch"><img width="200px" src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=ashinch&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>
+[<img src="https://s1.ax1x.com/2023/01/12/pSnHqpQ.png" alt="donate" height="80">](https://afdian.net/a/ashinch)
 
 Danke für all die Liebe und Unterstützung ❤️
 

README.md

@@ -71,11 +71,11 @@ If an [AAIdrive](https://github.com/BimmerGestalt/AAIdrive)-compatible car is co
 
 Please use the [official ReadYou app](https://github.com/Ashinch/ReadYou) if you don't need car features because it will be more updated.
 
-## Sponsor
+## Sponsorship
 
 **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 ☕️.
 
-<a href="https://www.buymeacoffee.com/ashinch"><img width="200px" src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=ashinch&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>
+[<img src="https://s1.ax1x.com/2023/01/12/pSnHqpQ.png" alt="donate" height="80">](https://afdian.net/a/ashinch)
 
 Thanks for all the love and support ❤️
 

app/build.gradle

@@ -3,7 +3,8 @@ 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"
+    id 'com.mikepenz.aboutlibraries.plugin'
 }
 
 apply from: '../external/external.gradle'
@@ -17,14 +18,14 @@ if (keyPropsFile.exists()) {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "me.ash.reader"
         minSdk 26
         targetSdk 33
-        versionCode 23
-        versionName "0.9.12"
+        versionCode 25
+        versionName "0.10.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -43,16 +44,16 @@ android {
 
     flavorDimensions "channel"
     productFlavors {
+        github {
+            dimension "channel"
+        }
         fdroid {
             dimension "channel"
         }
         googlePlay {
             dimension "channel"
             applicationIdSuffix ".google.play"
         }
-        github {
-            dimension "channel"
-        }
         gestalt {
             dimension "channel"
         }
@@ -65,6 +66,9 @@ android {
             storePassword keyProps["storePassword"]
         }
     }
+    lint {
+        disable.addAll("MissingTranslation", "ExtraTranslation")
+    }
     buildTypes {
         release {
             minifyEnabled true
@@ -82,27 +86,38 @@ android {
         freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11
     }
     buildFeatures {
         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'
 }
 
 dependencies {
+    // https://github.com/mikepenz/AboutLibraries/releases
+    implementation "com.mikepenz:aboutlibraries-core:${aboutLibsRelease}"
+    implementation "com.mikepenz:aboutlibraries-compose-m3:${aboutLibsRelease}"
+
+    // https://github.com/ireward/compose-html/tags
     implementation "com.github.ireward:compose-html:1.0.2"
 
     // http://bigbadaboom.github.io/androidsvg/release_notes.html
@@ -123,6 +138,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'
 
@@ -148,12 +166,12 @@ dependencies {
     kapt "androidx.room:room-compiler:$room"
 
     // https://developer.android.com/jetpack/androidx/releases/paging
-    implementation "androidx.paging:paging-common:$paging"
-    implementation "androidx.paging:paging-runtime:$paging"
-    implementation "androidx.paging:paging-compose:1.0.0-alpha14"
+    implementation "androidx.paging:paging-common-ktx:$paging"
+    implementation "androidx.paging:paging-runtime-ktx:$paging"
+    implementation "androidx.paging:paging-compose:$paging"
 
     // https://developer.android.com/jetpack/androidx/releases/paging
-    implementation "androidx.browser:browser:1.5.0"
+    implementation "androidx.browser:browser:1.8.0"
 
     // https://developer.android.com/jetpack/androidx/releases/navigation
     implementation "androidx.navigation:navigation-compose:$navigation"
@@ -163,42 +181,49 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle"
 
     // https://developer.android.com/jetpack/androidx/releases/compose-material3
-    implementation "androidx.compose.material3:material3:$material3"
+    implementation "androidx.compose.material3: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.13.1"
+    implementation "androidx.activity:activity-compose:1.9.0"
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     testImplementation "junit:junit:4.13.2"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
+
+    // mockito
+    testImplementation "org.mockito:mockito-core:5.11.0"
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.11.0'
+    testImplementation "org.mockito.kotlin:mockito-kotlin:5.2.1"
 
     // BimmerGestalt
     gestaltImplementation 'io.bimmergestalt:IDriveConnectKit:0.6'

app/proguard-rules.pro

@@ -35,4 +35,10 @@
 -keep class com.rometools.** { *; }
 
 # Provider API
--keep class me.ash.reader.infrastructure.** { *; }
+-keep class me.ash.reader.** { *; }
+
+# 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,8 +3,9 @@
     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" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
@@ -27,12 +28,52 @@
         <activity
             android:name=".infrastructure.android.MainActivity"
             android:exported="true"
+            android:launchMode="singleInstance"
             android:theme="@style/Theme.Reader">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+
+                <data android:host="*" />
+
+                <data android:mimeType="text/xml" />
+                <data android:mimeType="application/rss+xml" />
+                <data android:mimeType="application/atom+xml" />
+                <data android:mimeType="application/xml" />
+                <data android:mimeType="application/json" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".infrastructure.android.CrashReportActivity"
+            android:exported="false"
+            android:theme="@style/Theme.Reader">
+
         </activity>
 
         <provider
@@ -49,6 +90,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>

app/src/main/java/me/ash/reader/domain/model/general/Filter.kt

@@ -1,6 +1,7 @@
 package me.ash.reader.domain.model.general
 
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.Subject
 import androidx.compose.material.icons.outlined.FiberManualRecord
 import androidx.compose.material.icons.rounded.FiberManualRecord
 import androidx.compose.material.icons.rounded.Star
@@ -65,8 +66,8 @@ class Filter private constructor(
         )
         val All = Filter(
             index = 2,
-            iconOutline = Icons.Rounded.Subject,
-            iconFilled = Icons.Rounded.Subject,
+            iconOutline = Icons.AutoMirrored.Rounded.Subject,
+            iconFilled = Icons.AutoMirrored.Rounded.Subject,
         )
         val values = listOf(Starred, Unread, All)
     }

app/src/main/java/me/ash/reader/domain/repository/ArticleDao.kt

@@ -370,9 +370,10 @@ interface ArticleDao {
         DELETE FROM article
         WHERE accountId = :accountId
         AND feedId = :feedId
+        AND (isStarred = :includeStarred OR :includeStarred = 1)
         """
     )
-    suspend fun deleteByFeedId(accountId: Int, feedId: String)
+    suspend fun deleteByFeedId(accountId: Int, feedId: String, includeStarred: Boolean = false)
 
     @Query(
         """
@@ -383,10 +384,11 @@ interface ArticleDao {
             AND a.feedId = b.id
             AND b.groupId = c.id
             AND c.id = :groupId
+            AND (a.isStarred = :includeStarred OR :includeStarred = 1)
         )
         """
     )
-    suspend fun deleteByGroupId(accountId: Int, groupId: String)
+    suspend fun deleteByGroupId(accountId: Int, groupId: String, includeStarred: Boolean = false)
 
     @Query(
         """