[1.141.*] Pre-release merge (#487)

msasikanth · Apr 27, 2024 · 7cec4b3 · 7cec4b3
2 parents 8785ee8 + 703bcb2
commit 7cec4b3
Show file tree

Hide file tree

Showing 17 changed files with 1,034 additions and 840 deletions.
diff --git a/.github/workflows/ci_checks.yml b/.github/workflows/ci_checks.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   code-formatting:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
@@ -60,11 +60,17 @@ jobs:
         run: ./gradlew cleanAllTests allTests
 
   android-tests:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
 
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Setup JDK 20
         uses: actions/setup-java@v4
         with:

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.9.23"
 android_gradle_plugin = "8.3.2"
-compose = "1.6.2"
+compose = "1.6.10-beta02"
 
 android_sdk_compile = "34"
 android_sdk_target = "34"

diff --git a/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/DeTwineStrings.kt b/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/DeTwineStrings.kt
@@ -154,4 +154,5 @@ val DeTwineStrings =
     actionGroupsTooltip = "Gruppen können nicht innerhalb anderer Gruppen sein.",
     groupAddNew = "Add new",
     appBarAllFeeds = "All feeds",
+    edit = "Edit",
   )
diff --git a/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt b/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt
@@ -161,4 +161,5 @@ val EnTwineStrings =
     actionGroupsTooltip = "Groups cannot be inside other groups.",
     groupAddNew = "Add new",
     appBarAllFeeds = "All feeds",
+    edit = "Edit",
   )
diff --git a/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TrTwineStrings.kt b/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TrTwineStrings.kt
@@ -150,4 +150,5 @@ val TrTwineStrings =
     actionGroupsTooltip = "Gruplar başka grupların içinde olamaz.",
     groupAddNew = "Add new",
     appBarAllFeeds = "All feeds",
+    edit = "Edit",
   )
diff --git a/.../strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TwineStrings.kt b/.../strings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/TwineStrings.kt
@@ -141,6 +141,7 @@ data class TwineStrings(
   val actionGroupsTooltip: String,
   val groupAddNew: String,
   val appBarAllFeeds: String,
+  val edit: String
 )
 
 object Locales {

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/AppPresenter.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/AppPresenter.kt
@@ -153,7 +153,8 @@ class AppPresenter(
               { navigation.push(Config.Bookmarks) },
               { navigation.push(Config.Settings) },
               { openPost(it) },
-              { modalNavigation.activate(ModalConfig.GroupSelection) }
+              { modalNavigation.activate(ModalConfig.GroupSelection) },
+              { modalNavigation.activate(ModalConfig.FeedInfo(it)) }
             )
         )
       }

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/FeedsEvent.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/FeedsEvent.kt
@@ -38,7 +38,7 @@ sealed interface FeedsEvent {
 
   data object ClearSearchQuery : FeedsEvent
 
-  data class OnFeedClick(val source: Source) : FeedsEvent
+  data class OnSourceClick(val source: Source) : FeedsEvent
 
   data class OnFeedSortOrderChanged(val feedsOrderBy: FeedsOrderBy) : FeedsEvent
 
@@ -60,5 +60,7 @@ sealed interface FeedsEvent {
 
   data class OnGroupsSelected(val groupIds: Set<String>) : FeedsEvent
 
+  data class OnEditSourceClicked(val source: Source) : FeedsEvent
+
   data object OnAddToGroupClicked : FeedsEvent
 }
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/FeedsPresenter.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feeds/FeedsPresenter.kt
@@ -31,6 +31,7 @@ import com.arkivanov.essenty.instancekeeper.InstanceKeeper
 import com.arkivanov.essenty.instancekeeper.getOrCreate
 import com.arkivanov.essenty.lifecycle.doOnCreate
 import dev.sasikanth.rss.reader.core.model.local.Feed
+import dev.sasikanth.rss.reader.core.model.local.FeedGroup
 import dev.sasikanth.rss.reader.core.model.local.Source
 import dev.sasikanth.rss.reader.core.model.local.SourceType
 import dev.sasikanth.rss.reader.feeds.ui.FeedsViewMode
@@ -77,6 +78,7 @@ class FeedsPresenter(
   private val observableActiveSource: ObservableActiveSource,
   @Assisted componentContext: ComponentContext,
   @Assisted private val openGroupSelectionSheet: () -> Unit,
+  @Assisted private val openFeedInfoSheet: (feedId: String) -> Unit,
 ) : ComponentContext by componentContext {
 
   private val presenterInstance =
@@ -100,12 +102,20 @@ class FeedsPresenter(
 
   fun dispatch(event: FeedsEvent) {
     when (event) {
-      is FeedsEvent.OnFeedClick -> {
-        // TODO: Open source screen with posts
-      }
       is FeedsEvent.OnAddToGroupClicked -> {
         openGroupSelectionSheet()
       }
+      is FeedsEvent.OnEditSourceClicked -> {
+        when (val source = event.source) {
+          is Feed -> openFeedInfoSheet(source.id)
+          is FeedGroup -> {
+            // TODO: Open edit feed group screen
+          }
+          else -> {
+            throw IllegalArgumentException("Unknown source: $source")
+          }
+        }
+      }
       else -> {
         // no-op
       }
@@ -146,10 +156,7 @@ class FeedsPresenter(
         is FeedsEvent.OnFeedPinClicked -> onFeedPinClicked(event.feed)
         FeedsEvent.ClearSearchQuery -> clearSearchQuery()
         is FeedsEvent.SearchQueryChanged -> onSearchQueryChanged(event.searchQuery)
-        is FeedsEvent.OnFeedClick -> {
-          // TODO: Remove once source page with posts is implemented
-          onSourceClicked(event.source)
-        }
+        is FeedsEvent.OnSourceClick -> onSourceClicked(event.source)
         FeedsEvent.TogglePinnedSection -> onTogglePinnedSection()
         is FeedsEvent.OnFeedSortOrderChanged -> onFeedSortOrderChanged(event.feedsOrderBy)
         FeedsEvent.OnChangeFeedsViewModeClick -> onChangeFeedsViewModeClick()
@@ -163,6 +170,9 @@ class FeedsPresenter(
         FeedsEvent.OnAddToGroupClicked -> {
           // no-op
         }
+        is FeedsEvent.OnEditSourceClicked -> {
+          // no-op
+        }
       }
     }
 
@@ -206,7 +216,12 @@ class FeedsPresenter(
     private fun onDeleteSelectedSources() {
       coroutineScope
         .launch { rssRepository.deleteSources(_state.value.selectedSources) }
-        .invokeOnCompletion { dispatch(FeedsEvent.CancelSourcesSelection) }
+        .invokeOnCompletion {
+          if (_state.value.selectedSources.any { it.id == _state.value.activeSource?.id }) {
+            _state.update { it.copy(activeSource = null) }
+          }
+          dispatch(FeedsEvent.CancelSourcesSelection)
+        }
     }
 
     private fun onCancelSourcesSelection() {