[1.117.*] Pre-release merge (#433)

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/FeedsPresenter.kt

@@ -297,7 +297,7 @@ class FeedsPresenter(
         settingsRepository.postsType.distinctUntilChanged().flatMapLatest { postsType ->
           val postsAfter = postsAfterInstantFromPostsType(postsType)
 
-          feedsPager(postsAfter, FeedsOrderBy.Latest).cachedIn(coroutineScope)
+          feedsPager(postsAfter, FeedsOrderBy.Pinned).cachedIn(coroutineScope)
         }
 
       observableSelectedFeed.selectedFeed

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/BottomSheetCollapsedContent.kt

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 Sasikanth Miriyampalli
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.sasikanth.rss.reader.feeds.ui
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithCache
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import app.cash.paging.compose.LazyPagingItems
+import dev.sasikanth.rss.reader.core.model.local.Feed
+import dev.sasikanth.rss.reader.ui.AppTheme
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun BottomSheetCollapsedContent(
+  feeds: LazyPagingItems<Feed>,
+  selectedFeed: Feed?,
+  canShowUnreadPostsCount: Boolean,
+  onFeedSelected: (Feed) -> Unit,
+  onHomeSelected: () -> Unit,
+  modifier: Modifier = Modifier
+) {
+  LazyRow(
+    modifier = modifier.fillMaxWidth().padding(start = 20.dp),
+    horizontalArrangement = Arrangement.spacedBy(8.dp),
+    contentPadding = PaddingValues(end = 24.dp)
+  ) {
+    stickyHeader {
+      val shadowColors =
+        arrayOf(
+          0.85f to AppTheme.colorScheme.tintedBackground,
+          0.9f to AppTheme.colorScheme.tintedBackground.copy(alpha = 0.4f),
+          1f to Color.Transparent
+        )
+
+      HomeBottomBarItem(
+        selected = selectedFeed == null,
+        onClick = onHomeSelected,
+        modifier =
+          Modifier.drawWithCache {
+              onDrawBehind {
+                val brush =
+                  Brush.horizontalGradient(
+                    colorStops = shadowColors,
+                  )
+                drawRect(
+                  brush = brush,
+                )
+              }
+            }
+            .padding(end = 4.dp)
+      )
+    }
+
+    items(feeds.itemCount) { index ->
+      val feed = feeds[index]
+      if (feed != null) {
+        FeedBottomBarItem(
+          text = feed.name.uppercase(),
+          badgeCount = feed.numberOfUnreadPosts,
+          iconUrl = feed.icon,
+          canShowUnreadPostsCount = canShowUnreadPostsCount,
+          selected = selectedFeed?.link == feed.link,
+          onClick = { onFeedSelected(feed) }
+        )
+      }
+    }
+  }
+}

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/BottomBar.kt → shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/ui/BottomSheetExpandedBottomBar.kt

@@ -50,7 +50,7 @@ import dev.sasikanth.rss.reader.resources.strings.LocalStrings
 import dev.sasikanth.rss.reader.ui.AppTheme
 
 @Composable
-fun BottomBar(
+internal fun BottomSheetExpandedBottomBar(
   modifier: Modifier = Modifier,
   onNewGroupClick: () -> Unit,
   onNewFeedClick: () -> Unit,