Use CollectionView for reader

jerry08 · Feb 4, 2024 · c162f75 · c162f75
1 parent 2f3b281
commit c162f75
Showing 1 changed file with 56 additions and 64 deletions.
diff --git a/Anikin/Views/Manga/MangaReaderPage.xaml b/Anikin/Views/Manga/MangaReaderPage.xaml
@@ -37,72 +37,64 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <ScrollView>
-        <Grid RowDefinitions="auto,*">
-            <Grid
-                Grid.Row="2"
+    <Grid RowDefinitions="auto,*">
+        <Grid
+            Grid.Row="2"
+            HorizontalOptions="CenterAndExpand"
+            IsVisible="{Binding IsBusy}"
+            VerticalOptions="CenterAndExpand"
+            ZIndex="1000">
+            <ActivityIndicator
+                HeightRequest="{OnPlatform Default=60,
+                                           WinUI=100}"
                 HorizontalOptions="CenterAndExpand"
-                IsVisible="{Binding IsBusy}"
+                IsRunning="True"
                 VerticalOptions="CenterAndExpand"
-                ZIndex="1000">
-                <ActivityIndicator
-                    HeightRequest="{OnPlatform Default=60,
-                                               WinUI=100}"
-                    HorizontalOptions="CenterAndExpand"
-                    IsRunning="True"
-                    VerticalOptions="CenterAndExpand"
-                    WidthRequest="{OnPlatform Default=60,
-                                              WinUI=100}">
-                    <ActivityIndicator.Triggers>
-                        <DataTrigger
-                            Binding="{Binding IsLoading}"
-                            TargetType="ActivityIndicator"
-                            Value="True">
-                            <Setter Property="IsRunning" Value="False" />
-                            <Setter Property="BackgroundColor" Value="Transparent" />
-                        </DataTrigger>
-                    </ActivityIndicator.Triggers>
-                </ActivityIndicator>
-            </Grid>
-
-            <Grid
-                Grid.Row="2"
-                HorizontalOptions="FillAndExpand"
-                IsVisible="False"
-                VerticalOptions="FillAndExpand">
-                <Grid.Triggers>
-                    <MultiTrigger TargetType="Grid">
-                        <MultiTrigger.Conditions>
-                            <BindingCondition Binding="{Binding IsBusy}" Value="False" />
-                            <BindingCondition Binding="{Binding IsVisible, Source={x:Reference PagesCollectionView}}" Value="True" />
-                            <BindingCondition Binding="{Binding Entities, Converter={StaticResource IsListNullOrEmptyConverter}}" Value="True" />
-                        </MultiTrigger.Conditions>
-                        <MultiTrigger.Setters>
-                            <Setter Property="IsVisible" Value="True" />
-                        </MultiTrigger.Setters>
-                    </MultiTrigger>
-                </Grid.Triggers>
-                <Label
-                    FontSize="16"
-                    HorizontalOptions="Center"
-                    Text="Failed to load images"
-                    VerticalOptions="Center" />
-            </Grid>
+                WidthRequest="{OnPlatform Default=60,
+                                          WinUI=100}">
+                <ActivityIndicator.Triggers>
+                    <DataTrigger
+                        Binding="{Binding IsLoading}"
+                        TargetType="ActivityIndicator"
+                        Value="True">
+                        <Setter Property="IsRunning" Value="False" />
+                        <Setter Property="BackgroundColor" Value="Transparent" />
+                    </DataTrigger>
+                </ActivityIndicator.Triggers>
+            </ActivityIndicator>
+        </Grid>
 
-            <Grid
-                x:Name="PagesCollectionView"
-                Grid.Row="2"
-                Margin="0,0,0,10"
-                IsVisible="{Binding IsBusy, Converter={StaticResource InvertedBoolConverter}}">
-                <controls:PinchZoom>
-                    <Grid>
-                        <VerticalStackLayout
-                            BindableLayout.ItemTemplateSelector="{StaticResource ImageTemplateSelector}"
-                            BindableLayout.ItemsSource="{Binding Entities}"
-                            HorizontalOptions="Center" />
-                    </Grid>
-                </controls:PinchZoom>
-            </Grid>
+        <Grid
+            Grid.Row="2"
+            HorizontalOptions="FillAndExpand"
+            IsVisible="False"
+            VerticalOptions="FillAndExpand">
+            <Grid.Triggers>
+                <MultiTrigger TargetType="Grid">
+                    <MultiTrigger.Conditions>
+                        <BindingCondition Binding="{Binding IsBusy}" Value="False" />
+                        <BindingCondition Binding="{Binding IsVisible, Source={x:Reference PagesCollectionView}}" Value="True" />
+                        <BindingCondition Binding="{Binding Entities, Converter={StaticResource IsListNullOrEmptyConverter}}" Value="True" />
+                    </MultiTrigger.Conditions>
+                    <MultiTrigger.Setters>
+                        <Setter Property="IsVisible" Value="True" />
+                    </MultiTrigger.Setters>
+                </MultiTrigger>
+            </Grid.Triggers>
+            <Label
+                FontSize="16"
+                HorizontalOptions="Center"
+                Text="Failed to load images"
+                VerticalOptions="Center" />
         </Grid>
-    </ScrollView>
+
+        <CollectionView
+            x:Name="PagesCollectionView"
+            Grid.Row="2"
+            Margin="0,0,0,10"
+            HorizontalOptions="Center"
+            IsVisible="{Binding IsBusy, Converter={StaticResource InvertedBoolConverter}}"
+            ItemTemplate="{StaticResource ImageTemplateSelector}"
+            ItemsSource="{Binding Entities}" />
+    </Grid>
 </local:BasePage>