dernier push

Sources/View/ModelViewPage/ChampionsViewM.cs

@@ -10,11 +10,8 @@ namespace View.ModelViewPage
 {
 	public class ChampionsViewM
 	{
-        public Command NextPageCommand { get; private set; }
-        public Command PreviousPageCommand { get; }
         public Command EditChampionCommand { get; }
         public ChampionManagerVM championManagerVm { get; }
-        public Command DeleteChampionCommand { get; private set; }
         
 
         public ChampionsViewM(ChampionManagerVM championManager)
@@ -22,39 +19,12 @@ namespace View.ModelViewPage
         {
             championManagerVm = championManager;
             PushToDetailCommand = new Command<ChampionVm>(PushToDetail);
-            DeleteChampionCommand = new Command<ChampionVm>(async (ChampionVm obj) => await championManagerVm.DeleteChampion(obj));
-            NextPageCommand = new Command(NextPage, CanExecuteNext);
-            PreviousPageCommand = new Command(PreviousPage, CanExecutePrevious);
+            
             AddChampionCommand = new Command(Addchampion);
             EditChampionCommand = new Command<ChampionVm>(EditChampion);
 
         }
-        private void NextPage()
-        {
-            championManagerVm.Index++;
-            RefreshCanExecute();
-
-        }
-        private void PreviousPage()
-        {
-            championManagerVm.Index--;
-            RefreshCanExecute();
-        }
-        private bool CanExecutePrevious()
-        {
-            return championManagerVm.Index > 1;
-        }
-        private bool CanExecuteNext()
-        {
-            var val = (this.championManagerVm.Index) < this.championManagerVm.PageTotale;
-            return val;
-        }
-        void RefreshCanExecute()
-        {
-
-            PreviousPageCommand.ChangeCanExecute();
-            NextPageCommand.ChangeCanExecute();
-        }
+        
 
         public Command PushToDetailCommand { get; }
         public Command AddChampionCommand { get; }

Sources/View/Page/ChampionsView.xaml

@@ -47,7 +47,7 @@
                                            
                                             <SwipeItem Text="Supprimer"
                                                        BackgroundColor="Red"
-                                                       Command="{Binding Source={RelativeSource AncestorType={x:Type vm:ChampionsViewM}}, Path=DeleteChampionCommand} "
+                                                       Command="{Binding Source={RelativeSource AncestorType={x:Type vm:ChampionsViewM}}, Path=championManagerVm.DeleteChampionCommand} "
                                                        CommandParameter="{Binding .}" />
                                                     </SwipeItems>
                                         </SwipeView.RightItems>                          
@@ -82,11 +82,11 @@
                 </Grid.RowDefinitions>
                 <HorizontalStackLayout >
                   
-                    <Button Text="L" HeightRequest="12 " WidthRequest="12" Padding="15" Command="{Binding  PreviousPageCommand}"/>
+                    <Button Text="L" HeightRequest="12 " WidthRequest="12" Padding="15" Command="{Binding  championManagerVm.PreviousPageCommand}"/>
                    
               
                     <Button Text="R"  HeightRequest="12 " Padding="10" WidthRequest="12" 
-                        Command="{Binding NextPageCommand}" />
+                        Command="{Binding championManagerVm.NextPageCommand}" />
          
 
                     </HorizontalStackLayout>

Sources/View/Page/DetailChampion.xaml

@@ -25,7 +25,7 @@
         </Grid.RowDefinitions>
 
          <Grid Grid.Row="1" WidthRequest="420" HeightRequest="200" Margin="20">
-             <Image Source="{Binding ChampionVM.Image.Base64, Converter={StaticResource Base64ToImageConverter}}"></Image>
+             <Image Source="{Binding ChampionVM.Image, Converter={StaticResource Base64ToImageConverter}}"></Image>
             </Grid>
        <Grid Grid.Row="2" Margin="20">
            <Grid.ColumnDefinitions>

Sources/ViewModels/ViewM/ChampionManagerVM.cs

@@ -12,7 +12,9 @@ namespace ViewModels
     {
             public ObservableCollection<ChampionVm> Champions { get; }
             public event PropertyChangedEventHandler? PropertyChanged;
-            public ICommand NextPageCommand { get; private set; }
+            public Command NextPageCommand { get; private set; }
+            public Command PreviousPageCommand { get; }
+            public Command DeleChampionCommand { get; }
             public ICommand DeleteChampionCommand { get; }
 
             public IDataManager DataManager
@@ -31,10 +33,12 @@ namespace ViewModels
             {
                 DataManager = dataManager;
                 Champions = new ObservableCollection<ChampionVm>();
-               
-                LoadChampions(index, Count).ConfigureAwait(false);
+            DeleteChampionCommand = new Command<ChampionVm>(async (ChampionVm obj) => await DeleteChampion(obj));
+            NextPageCommand = new Command(NextPage, CanExecuteNext);
+            PreviousPageCommand = new Command(PreviousPage, CanExecutePrevious);
+
+            LoadChampions(index, Count).ConfigureAwait(false);
                 PropertyChanged += ChampionManagerVM_PropertyChanged;
-                PropertyChanged += ChampionManager_PropertyChanged;
                 Total = this.DataManager.ChampionsMgr.GetNbItems().Result;
             }
 
@@ -47,7 +51,33 @@ namespace ViewModels
                 }
             }
 
-            public int Index
+        private void NextPage()
+        {
+            Index++;
+            RefreshCanExecute();
+
+        }
+        private void PreviousPage()
+        {
+            Index--;
+            RefreshCanExecute();
+        }
+        private bool CanExecutePrevious()
+        {
+            return Index > 1;
+        }
+        private bool CanExecuteNext()
+        {
+            var val = (this.Index) < this.PageTotale;
+            return val;
+        }
+        void RefreshCanExecute()
+        {
+            PreviousPageCommand.ChangeCanExecute();
+            NextPageCommand.ChangeCanExecute();
+        }
+
+        public int Index
             {
                 get => index;
                 set
@@ -77,14 +107,6 @@ namespace ViewModels
                     OnPropertyChanged();
                 }
             }
-            public int nombrepage(int GetNbItems, int count)
-            {
-                int result = GetNbItems / count;
-
-                if (result < 0) return result + 1;
-                else
-                    return result;
-            }
             protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
             {
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
@@ -102,15 +124,6 @@ namespace ViewModels
                 }
             }
 
-            private async void ChampionManager_PropertyChanged(object? sender, PropertyChangedEventArgs e)
-            {
-                if (e.PropertyName == nameof(Index))
-                {
-                    Champions.Clear();
-                    await LoadChampions(Index, Count);
-                }
-            }
-
             public async void SaveChampion(EditChampionVm editableChampionVM, ChampionVm? championVM)
             {
                 if (editableChampionVM is null) return;

Sources/ViewModels/ViewM/ChampionVm.cs

@@ -42,13 +42,13 @@ namespace ViewModels
             }
         }
 
-        public LargeImage Image
+        public string Image
         {
-            get => Model.Image;
+            get => Model.Image.Base64;
             set
             {
                 if (model == null) return;
-                Model.Image = value;
+                Model.Image.Base64 = value;
                 OnPropertyChanged();
             }
         }

Sources/ViewModels/ViewM/EditChampionVm.cs

@@ -16,7 +16,7 @@ namespace ViewModels
             _bio = IsNew ? string.Empty : Model.Bio;
             icon = IsNew ? string.Empty : Model.Icon;
             _name = IsNew ? string.Empty : Model.Name;
-            image = IsNew ? string.Empty : Model.Image.Base64;
+            image = IsNew ? string.Empty : Model.Image;
             _classe = IsNew ? ChampionClass.Unknown : Model.Class;
             ListClasses = Enum.GetValues<ChampionClass>().Where(c => c != ChampionClass.Unknown).ToArray();
         }
@@ -113,7 +113,7 @@ namespace ViewModels
             {
                 Model.Bio = Bio;
                 Model.Icon = Icon;
-                Model.Image.Base64 = Image;
+                Model.Image = Image;
                 Model.Class = Class;
             }
             else