Merge branch 'master' into develop

# Conflicts:
#	app/build.gradle.kts

Author: Shinokuni

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v2.1.1
+
+- Fix unclickable feeds at the bottom of the drawer  on long lists (#301)
+- Fix folders not being updatable when having no feeds for local accounts (#312)
+- Remove AlphaSlider in ColorPickerDialog as alpha colors are not supported by Android color contrast utils (#308)
+- Fix an annoying bug where certain items could not being set read/starred when coming back from the pager
+- Do not display Feedly account type in account selection dialog
+
 # v2.1.0
 
 This release focuses mainly on QOL improvements. You will find among them long time requested features. I hope in the future to be able to deliver new releases in less than six months.

app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
     defaultConfig {
         applicationId = "com.readrops.app"
 
-        versionCode = 21
-        versionName = "2.1.0"
+        versionCode = 22
+        versionName = "2.1.1"
 
         testInstrumentationRunner = "com.readrops.app.ReadropsTestRunner"
     }

app/src/main/java/com/readrops/app/account/dialog/AccountSelectionDialog.kt

@@ -23,6 +23,7 @@ fun AccountSelectionDialog(
         onDismiss = onDismiss
     ) {
         AccountType.entries
+            .filter { it != AccountType.FEEDLY }
             .forEach { type ->
                 SelectableImageText(
                     image = adaptiveIconPainterResource(id = type.iconRes),

app/src/main/java/com/readrops/app/feeds/color/ColorPickerDialog.kt

@@ -20,7 +20,6 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.github.skydoves.colorpicker.compose.AlphaSlider
 import com.github.skydoves.colorpicker.compose.BrightnessSlider
 import com.github.skydoves.colorpicker.compose.HsvColorPicker
 import com.github.skydoves.colorpicker.compose.rememberColorPickerController
@@ -58,14 +57,6 @@ fun ColorPickerDialog(
                 initialColor = color
             )
 
-            AlphaSlider(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = MaterialTheme.spacing.shortSpacing)
-                    .height(24.dp),
-                controller = controller,
-            )
-
             BrightnessSlider(
                 modifier = Modifier
                     .fillMaxWidth()

app/src/main/java/com/readrops/app/item/ItemScreenModel.kt

@@ -40,8 +40,9 @@ import com.readrops.db.pojo.ItemWithFeed
 import com.readrops.db.queries.ItemSelectionQueryBuilder
 import com.readrops.db.queries.ItemsQueryBuilder
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -51,7 +52,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import org.koin.core.parameter.parametersOf
@@ -92,6 +92,7 @@ class ItemScreenModel(
                 )
             )
         )
+
     // based type is Flow because with StateFlow when coming back from process death, pager doesn't resume
     // it might be due to stateIn() overlapping cachedIn(), but not sure
     var itemState: Flow<PagingData<ItemWithFeed>> = _itemState.asStateFlow()
@@ -360,23 +361,29 @@ class ItemScreenModel(
         itemWithFeed, context, useCustomShareIntentTpl.value, customShareIntentTpl.value
     )
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onDispose() {
-        screenModelScope.launch(dispatcher) {
-            withContext(NonCancellable) {
-                repository.setItemsRead(
-                    items = state.value.stateChanges
-                        .filter { it.readChange }
-                        .map { it.item }
-                )
+        // Use GlobalScope instead of NonCancellable
+        // It seems that NonCancellable is not is sufficiently non cancellable
+        // I ran multiple times into very frustrating situations where items were not set read
+        // The risk of leak here is mitigated by the fact that only one shot operations are performed
+        // If the coroutine is cancelled for whatever reason, only items state will be lost, which is not a big deal
+        // and should happen very rarely
+        GlobalScope.launch(dispatcher) {
+            repository.setItemsRead(
+                items = state.value.stateChanges
+                    .filter { it.readChange }
+                    .map { it.item }
+            )
+
+            state.value.stateChanges
+                .filter { it.starChange }
+                .forEach {
+                    repository.setItemStarState(it.item.apply {
+                        isStarred = !isStarred
+                    })
+                }
 
-                state.value.stateChanges
-                    .filter { it.starChange }
-                    .forEach {
-                        repository.setItemStarState(it.item.apply {
-                            isStarred = !isStarred
-                        })
-                    }
-            }
         }
     }
 }

db/src/main/java/com/readrops/db/queries/FoldersAndFeedsQueryBuilder.kt

@@ -21,7 +21,7 @@ object FoldersAndFeedsQueryBuilder {
         "Feed.remote_id as feedRemoteId",
         "Folder.id As folderId",
         "Folder.name As folderName",
-        "Feed.account_id as accountId",
+        "Folder.account_id as accountId",
         "Folder.remoteId as folderRemoteId"
     )
 

fastlane/metadata/android/en-US/changelogs/22.txt

@@ -0,0 +1,5 @@
+* Fix unclickable feeds at the bottom of the drawer  on long lists (#301)
+* Fix folders not being updatable when having no feeds for local accounts (#312)
+* Remove AlphaSlider in ColorPickerDialog as alpha colors are not supported by Android color contrast utils (#308)
+* Fix an annoying bug where certain items could not being set read/starred when coming back from the pager
+* Do not display Feedly account type in account selection dialog