sevenhill/BookReader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qwen edit

Browse Source
This commit is contained in:
Курнат Андрей
2026-02-18 14:49:20 +03:00
parent 1d9224a025
commit f0a3c19a3c
4 changed files with 126 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
BookReader/ViewModels/BookshelfViewModel.cs
View File

@@ -19,6 +19,12 @@ public partial class BookshelfViewModel : BaseViewModel
[ObservableProperty]
private bool _isEmpty;
[ObservableProperty]
private bool _isRefreshing;
[ObservableProperty]
private string _searchText = string.Empty;
public BookshelfViewModel(
IDatabaseService databaseService,
IBookParserService bookParserService,
@@ -43,6 +49,17 @@ public partial class BookshelfViewModel : BaseViewModel
try
{
var books = await _databaseService.GetAllBooksAsync();
// Применяем фильтр поиска если есть
if (!string.IsNullOrWhiteSpace(SearchText))
{
var searchLower = SearchText.ToLowerInvariant();
books = books.Where(b =>
b.Title.ToLowerInvariant().Contains(searchLower) ||
b.Author.ToLowerInvariant().Contains(searchLower)
).ToList();
}
Books.Clear();
foreach (var book in books)
{
@@ -60,6 +77,28 @@ public partial class BookshelfViewModel : BaseViewModel
}
}
[RelayCommand]
public async Task RefreshBooksAsync()
{
if (IsRefreshing) return;
IsRefreshing = true;
try
{
await LoadBooksAsync();
}
finally
{
IsRefreshing = false;
}
}
[RelayCommand]
public async Task SearchAsync()
{
await LoadBooksAsync();
}
[RelayCommand]
public async Task AddBookFromFileAsync()
{

26
BookReader/ViewModels/CalibreLibraryViewModel.cs
View File

@@ -26,6 +26,12 @@ public partial class CalibreLibraryViewModel : BaseViewModel
[ObservableProperty]
private string _downloadStatus = string.Empty;
[ObservableProperty]
private bool _isRefreshing;
[ObservableProperty]
private string _connectionErrorMessage = string.Empty;
private int _currentPage;
public CalibreLibraryViewModel(
@@ -67,6 +73,7 @@ public partial class CalibreLibraryViewModel : BaseViewModel
if (IsBusy || !IsConfigured) return;
IsBusy = true;
_currentPage = 0;
ConnectionErrorMessage = string.Empty;
try
{
@@ -79,7 +86,8 @@ public partial class CalibreLibraryViewModel : BaseViewModel
}
catch (Exception ex)
{
await _navigationService.DisplayAlertAsync("Error", $"Failed to load library: {ex.Message}", "OK");
ConnectionErrorMessage = "No connection to Calibre server";
System.Diagnostics.Debug.WriteLine($"Error loading Calibre library: {ex.Message}");
}
finally
{
@@ -87,6 +95,22 @@ public partial class CalibreLibraryViewModel : BaseViewModel
}
}
[RelayCommand]
public async Task RefreshBooksAsync()
{
if (IsRefreshing || !IsConfigured) return;
IsRefreshing = true;
try
{
await LoadBooksAsync();
}
finally
{
IsRefreshing = false;
}
}
[RelayCommand]
public async Task LoadMoreBooksAsync()
{

41
BookReader/Views/BookshelfPage.xaml
View File

@@ -30,10 +30,20 @@
</Grid>
</Shell.TitleView>
<Grid RowDefinitions="*,Auto" BackgroundColor="#3E2723">
<Grid RowDefinitions="Auto,*,Auto" BackgroundColor="#3E2723">
<!-- Search Bar -->
<SearchBar Grid.Row="0"
Text="{Binding SearchText}"
SearchCommand="{Binding SearchCommand}"
Placeholder="Search by title or author..."
PlaceholderColor="#A1887F"
TextColor="White"
BackgroundColor="#4E342E"
Margin="10,5" />
<!-- Bookshelf Background -->
<Grid Grid.Row="0">
<Grid Grid.Row="1">
<!-- Empty state -->
<VerticalStackLayout IsVisible="{Binding IsEmpty}"
VerticalOptions="Center"
@@ -54,18 +64,20 @@
HorizontalTextAlignment="Center" />
</VerticalStackLayout>
<!-- Book Collection -->
<CollectionView ItemsSource="{Binding Books}"
IsVisible="{Binding IsEmpty, Converter={StaticResource InvertedBoolConverter}}"
SelectionMode="None"
Margin="10">
<!-- Book Collection with PullToRefresh -->
<RefreshView Command="{Binding RefreshBooksCommand}"
IsRefreshing="{Binding IsRefreshing}"
IsVisible="{Binding IsEmpty, Converter={StaticResource InvertedBoolConverter}}">
<CollectionView ItemsSource="{Binding Books}"
SelectionMode="None"
Margin="10">
<CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical"
Span="3"
HorizontalItemSpacing="10"
VerticalItemSpacing="15" />
</CollectionView.ItemsLayout>
<CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical"
Span="3"
HorizontalItemSpacing="10"
VerticalItemSpacing="15" />
</CollectionView.ItemsLayout>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="models:Book">
@@ -144,6 +156,7 @@
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</RefreshView>
<!-- Loading Indicator -->
<ActivityIndicator IsRunning="{Binding IsBusy}"
@@ -156,7 +169,7 @@
</Grid>
<!-- Bottom Shelf / Action Bar -->
<Grid Grid.Row="1"
<Grid Grid.Row="2"
BackgroundColor="#4E342E"
Padding="15,10"
ColumnDefinitions="*,Auto,Auto">

41
BookReader/Views/CalibreLibraryPage.xaml
View File

@@ -38,6 +38,32 @@
HorizontalOptions="Center" />
</VerticalStackLayout>
<!-- Connection Error Message (Offline Mode) -->
<VerticalStackLayout Grid.Row="0"
IsVisible="{Binding IsConfigured}"
Padding="30"
Spacing="15"
VerticalOptions="Center">
<Label Text="⚠️ Connection failed"
FontSize="20"
TextColor="#FF7043"
HorizontalOptions="Center"
IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource IsNotNullOrEmptyConverter}}" />
<Label Text="{Binding ConnectionErrorMessage}"
FontSize="14"
TextColor="#B0B0B0"
HorizontalOptions="Center"
HorizontalTextAlignment="Center"
IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource IsNotNullOrEmptyConverter}}" />
<Button Text="🔄 Retry"
BackgroundColor="#5D4037"
TextColor="White"
CornerRadius="8"
Command="{Binding RefreshBooksCommand}"
HorizontalOptions="Center"
IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource IsNotNullOrEmptyConverter}}" />
</VerticalStackLayout>
<!-- Search Bar -->
<SearchBar Grid.Row="1"
IsVisible="{Binding IsConfigured}"
@@ -49,12 +75,14 @@
SearchCommand="{Binding SearchCommand}" />
<!-- Book List -->
<CollectionView Grid.Row="2"
IsVisible="{Binding IsConfigured}"
ItemsSource="{Binding Books}"
SelectionMode="None"
RemainingItemsThreshold="5"
RemainingItemsThresholdReachedCommand="{Binding LoadMoreBooksCommand}">
<RefreshView Grid.Row="2"
IsVisible="{Binding ConnectionErrorMessage, Converter={StaticResource InvertedBoolConverter}}"
Command="{Binding RefreshBooksCommand}"
IsRefreshing="{Binding IsRefreshing}">
<CollectionView ItemsSource="{Binding Books}"
SelectionMode="None"
RemainingItemsThreshold="5"
RemainingItemsThresholdReachedCommand="{Binding LoadMoreBooksCommand}">
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="models:CalibreBook">
@@ -113,6 +141,7 @@
</DataTemplate>
</CollectionView.ItemTemplate>
</CollectionView>
</RefreshView>
<!-- Status Bar -->
<Grid Grid.Row="3"