diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index 561f6c804..b158b6f07 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "app.omnivore.omnivore" minSdk 26 targetSdk 33 - versionCode 154 - versionName "0.0.154" + versionCode 158 + versionName "0.0.158" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/android/Omnivore/app/src/main/AndroidManifest.xml b/android/Omnivore/app/src/main/AndroidManifest.xml index fe83b565c..809ce0f0b 100644 --- a/android/Omnivore/app/src/main/AndroidManifest.xml +++ b/android/Omnivore/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + listOf("Newsletter") + SavedItemFilter.FEEDS -> listOf("RSS") else -> (activeLabelsLiveData.value ?: listOf()).map { it.name } } + activeLabelsLiveData.value?.let { requiredLabels = requiredLabels + it.map { it.name } } val excludeLabels = when(appliedFilterLiveData.value) { - SavedItemFilter.READ_LATER -> listOf("Newsletter") + SavedItemFilter.READ_LATER -> listOf("Newsletter", "RSS") else -> listOf() } diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt index e9ed148a9..7e651c577 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SavedItemFilter.kt @@ -7,7 +7,8 @@ import androidx.compose.runtime.Composable enum class SavedItemFilter(val displayText: String, val rawValue: String, val queryString: String) { INBOX("Inbox", rawValue = "inbox", "in:inbox"), - READ_LATER("Read Later", "readlater", "in:inbox -label:Newsletter"), + READ_LATER("Non-Feed Items", "nonFeed", "no:subscription"), + FEEDS("Feeds", "feeds", "in:inbox label:RSS"), NEWSLETTERS("Newsletters", "newsletters", "in:inbox label:Newsletter"), RECOMMENDED("Recommended", "recommended", "recommendedBy:*"), ALL("All", "all", "in:all"), @@ -32,6 +33,7 @@ fun SavedItemFilterContextMenu( SavedItemFilter.INBOX, SavedItemFilter.READ_LATER, SavedItemFilter.NEWSLETTERS, + SavedItemFilter.FEEDS, SavedItemFilter.ALL, SavedItemFilter.ARCHIVED, SavedItemFilter.FILES