From 297bddcf16d81ad4c0d1c56d397c9c1d96b79293 Mon Sep 17 00:00:00 2001 From: bricefriha Date: Fri, 24 Jan 2025 11:25:13 +0000 Subject: [PATCH 1/3] workflows - develop | switch back to 1.5 --- .github/workflows/pr-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-deploy.yml b/.github/workflows/pr-deploy.yml index 3955cf0..a57e734 100644 --- a/.github/workflows/pr-deploy.yml +++ b/.github/workflows/pr-deploy.yml @@ -6,7 +6,7 @@ on: branches: ['develop'] types: [opened, synchronize, reopened] env: - BUILD_VERSION: '1.6' + BUILD_VERSION: '1.5' DOTNET_VERSION: 9.0.x XCODE_VERSION: 16.2 DOTNET_VERSION_TARGETS: net9.0 From 11432547628b08edcdda43a4f6f99358a1e32e9f Mon Sep 17 00:00:00 2001 From: bricefriha Date: Fri, 24 Jan 2025 15:50:03 +0000 Subject: [PATCH 2/3] Feed - refresh android | `InsertArticles()` introdu a `force` mode to erease the the article --- App/ViewModels/FeedsViewModel.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/App/ViewModels/FeedsViewModel.cs b/App/ViewModels/FeedsViewModel.cs index d39a20b..502ea66 100644 --- a/App/ViewModels/FeedsViewModel.cs +++ b/App/ViewModels/FeedsViewModel.cs @@ -398,7 +398,7 @@ private async Task AggregateFeed(Feed feed, bool force = true) if (force) { // Update list of articles - InsertArticles(articles); + InsertArticles(articles, force); SelectedFeed.IsLoaded = true; IsRefreshing = false; @@ -426,14 +426,22 @@ private async Task AggregateFeed(Feed feed, bool force = true) /// Insert a set of articles in the current list /// /// articles to add - private void InsertArticles(IEnumerable
articles) + /// if true we overwrite the current article list + private void InsertArticles(IEnumerable
articles, bool force = false) { ObservableRangeCollection
articlesOld = new (_articles); + if (force) + { + Articles = new ObservableRangeCollection
(articles); + return; + } + Articles = new ObservableRangeCollection
(); Articles.AddRange(articles); if (articlesOld.Any()) Articles.AddRange(articlesOld); + } // See detail of the article From 088088926fa50dd1219a7f358dae6dc42564049a Mon Sep 17 00:00:00 2001 From: bricefriha Date: Fri, 24 Jan 2025 15:50:52 +0000 Subject: [PATCH 3/3] Feeds - vm| cleanup --- App/ViewModels/FeedsViewModel.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/App/ViewModels/FeedsViewModel.cs b/App/ViewModels/FeedsViewModel.cs index 502ea66..dda8be8 100644 --- a/App/ViewModels/FeedsViewModel.cs +++ b/App/ViewModels/FeedsViewModel.cs @@ -46,7 +46,7 @@ public int CurrentFeedIndex set { _currentFeedIndex = value; - //SwitchTabs(_currentFeedIndex); + OnPropertyChanged(nameof(CurrentFeedIndex)); @@ -436,11 +436,11 @@ private void InsertArticles(IEnumerable
articles, bool force = false) return; } - Articles = new ObservableRangeCollection
(); + Articles = new ObservableRangeCollection
(); Articles.AddRange(articles); if (articlesOld.Any()) - Articles.AddRange(articlesOld); + Articles.AddRange(articlesOld); }