A few small cleanup items - getting closer to working on iOS

IsaacMorris1980 · Aug 16, 2022 · 0a8d153 · 0a8d153
1 parent a6284cb
commit 0a8d153
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 37 deletions.
diff --git a/ShoppingList/View/UserListDetails.xaml.cs b/ShoppingList/View/UserListDetails.xaml.cs
@@ -1,4 +1,4 @@
-using Microsoft.Maui.Graphics.Platform;
+//using Microsoft.Maui.Graphics.Platform;
 using System.Reflection;
 using ShoppingList.ViewModels;
 using IImage = Microsoft.Maui.Graphics.IImage;
@@ -9,6 +9,8 @@ public partial class UserListDetails : ContentPage
 {
 	UserListDetailViewModel _ulvm;
 
+	bool _firstTime = true; 
+
 	public UserListDetails(UserListDetailViewModel userListDetailViewModel)
 	{
 		InitializeComponent();
@@ -23,35 +25,39 @@ public UserListDetails(UserListDetailViewModel userListDetailViewModel)
 		circularButton.Width = 75;
 		circularButton.Height = 75; 
 
-        IImage image;
-        Assembly assembly = GetType().GetTypeInfo().Assembly;
-        using (Stream stream = assembly.GetManifestResourceStream("ShoppingList.Resources.Images.plus_solid.svg"))
-        {
-            image = PlatformImage.FromStream(stream);
-        }
-		circularButton.Image = image;
+        //IImage image;
+        //Assembly assembly = GetType().GetTypeInfo().Assembly;
+        //using (Stream stream = assembly.GetManifestResourceStream("ShoppingList.Resources.Images.plus_solid.svg"))
+        //{
+        //    image = PlatformImage.FromStream(stream);
+        //}
+		//circularButton.Image = image;
 		circularButtonGV.Invalidate();
 
 
     }
 
 	public void OnCheckboxClicked(object sender, CheckedChangedEventArgs e)
 	{
+		if (_ulvm.PreventCheckEvent == true)
+			return; 
+
 		CheckBox thisCheckbox = sender as CheckBox;
 
 		Frame currentFrame = thisCheckbox.BindingContext as Frame;
 
 		Item itemThatWasClicked = currentFrame.BindingContext as Item;
 
 
-
 		if (thisCheckbox.IsChecked)
 			currentFrame.FadeTo(.4, 1000);
 		else
 			currentFrame.FadeTo(1, 1000);
 
-		itemThatWasClicked.IsCompleted = thisCheckbox.IsChecked;
+		//thisCheckbox.CheckedChanged -= OnCheckboxClicked; 
+		//itemThatWasClicked.IsCompleted = thisCheckbox.IsChecked;
 		_ulvm.ItemWasChecked(itemThatWasClicked);
+		//thisCheckbox.CheckedChanged += OnCheckboxClicked; 
 
 	}
 

diff --git a/ShoppingList/ViewModel/UserListDetailViewModel.cs b/ShoppingList/ViewModel/UserListDetailViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.ObjectModel;
+using Newtonsoft.Json.Linq;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 
 namespace ShoppingList.ViewModels;
@@ -9,6 +10,8 @@ public partial class UserListDetailViewModel : BaseViewModel
     readonly ItemService _itemService;
     readonly KrogerAPIService _krogerAPIService;
 
+    public bool PreventCheckEvent { get; set; } = false; 
+
     public UserListDetailViewModel()
     {
         _itemService = new();
@@ -40,24 +43,6 @@ public UserList UserList
     [ObservableProperty]
     public bool isRefreshing; 
 
-    [RelayCommand]
-    public async void CreateItem(UserList ul)
-    {
-        if (IsBusy)
-            return;
-
-        var newItem = new Item();
-        newItem.Name = "new item"; 
-        ul.Items.Add(newItem);
-        ul = ul;  
-
-        /*await Shell.Current.GoToAsync($"{nameof(ItemInput)}", true,
-            new Dictionary<string, object>
-            {
-                {"UserList", userList}
-            }); */
-    }
-
     [RelayCommand]
     public async void GoBackToListScreen()
     {
@@ -80,8 +65,7 @@ public void RefreshUserListDetailScreen()
 
         ListSorter.SortUserListItems(userList); 
 
-        // Forces CollectionView to update on refresh, otherwise, it doesn't work!
-        UserList = UserList; 
+        UserListNotifers();
 
         IsRefreshing = false; 
     }
@@ -95,13 +79,12 @@ await Shell.Current.DisplayAlert(item.Name, $"Category: {item.Category} \nDescri
 
     [RelayCommand]
     public void ItemWasChecked(Item item)
-    { 
+    {
         _itemService.UpdateItem(item);
 
         UserList.Items = ListSorter.SortUserListItems(userList);
 
-        //This forces on check to refresh collection view, but breaks opening a list for some reason
-        //UserList = UserList; 
+        //UserListNotifers();
 
     }
 
@@ -113,8 +96,8 @@ public void DeleteItem(Item item)
 
         UserList.Items = ListSorter.SortUserListItems(userList);
 
-        UserList = UserList; 
-
+        //UserList = UserList;
+        UserListNotifers(); 
     }
 
     [RelayCommand]
@@ -167,9 +150,19 @@ public async void OnItemEntryCompleted(string itemName)
         ListSorter.SortUserListItems(userList);
 
 
-        UserList = UserList;
+        //UserList = UserList;
+        UserListNotifers();
 
     }
+
+    private void UserListNotifers()
+    {
+        PreventCheckEvent = true; 
+        OnUserListChanged(UserList);
+        OnPropertyChanged(nameof(UserList));
+        OnPropertyChanged(nameof(UserList.Items));
+        PreventCheckEvent = false; 
+    }
 }