ランキング動画一覧ページの更新ボタンがオフライン時に押せるように修正。

tor4kichi · Feb 26, 2024 · 1956f18 · 1956f18
1 parent d42f3b4
commit 1956f18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Hohoema/ViewModels/HohoemaListingPageViewModelBase.cs b/Hohoema/ViewModels/HohoemaListingPageViewModelBase.cs
@@ -97,6 +97,7 @@ protected override async Task<IEnumerable<ITEM_VM>> LoadDataAsync(CancellationTo
     public AdvancedCollectionView? ItemsView { get; private set; }
 
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(CanRefresh))]
     private bool _nowLoading;
 
     partial void OnNowLoadingChanged(bool value)
@@ -261,7 +262,9 @@ private void OnLodingItemError(Exception e)
         _logger.ZLogError(e, "failed on incremental loadingItems.");
     }
 
-    [RelayCommand]
+    public bool CanRefresh => !NowLoading;
+
+    [RelayCommand(CanExecute = nameof(CanRefresh))]
     protected void ResetList()
     {
         _dispatcherQueue.TryEnqueue(() =>

diff --git a/Hohoema/Views.Niconico/Search/SearchResultKeywordPage.xaml b/Hohoema/Views.Niconico/Search/SearchResultKeywordPage.xaml
@@ -67,7 +67,7 @@
                 </AppBarButton>
 
                 <AppBarButton x:Name="SelectionToggleButton" Icon="List" Label="{i18nExt:Localize Key=Select}" Command="{x:Bind _vm.SelectionModeToggleCommand}" />
-                <AppBarButton x:Name="RefreshButton" Label="{i18nExt:Localize Key=Refresh}" Icon="Refresh" Command="{x:Bind _vm.ResetListCommand}" IsEnabled="{x:Bind _vm.CanChangeSort, Mode=OneWay}" VerticalAlignment="Center"></AppBarButton>
+                <AppBarButton x:Name="RefreshButton" Label="{i18nExt:Localize Key=Refresh}" Icon="Refresh" Command="{x:Bind _vm.ResetListCommand}" VerticalAlignment="Center"></AppBarButton>
               </CommandBar.PrimaryCommands>
               <CommandBar.SecondaryCommands>
 

diff --git a/Hohoema/Views.Niconico/VideoRanking/RankingCategoryPage.xaml b/Hohoema/Views.Niconico/VideoRanking/RankingCategoryPage.xaml
@@ -74,7 +74,6 @@
                               Label="{i18nExt:Localize Key=Refresh}" 
                               Icon="Refresh"
                               Command="{x:Bind _vm.ResetListCommand}"
-                              IsEnabled="{x:Bind _vm.CanChangeSort, Mode=OneWay}"
                               VerticalAlignment="Center"
                           >
               </AppBarButton>