Adding List Types

IsaacMorris1980 · Jul 27, 2022 · 3663d20 · 3663d20
1 parent 9af678d
commit 3663d20
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 31 deletions.
diff --git a/ShoppingList/Model/UserList.cs b/ShoppingList/Model/UserList.cs
@@ -20,6 +20,15 @@ public class UserList : ObservableObject
     [OneToMany]
     public List<Item> Items { get; set; }
 
+    public enum ListType
+    {
+        WeeklyGrocery,
+        ForAParty,
+        OutOfSnacks
+    }
+
+    [Column("type")]
+    public ListType Type { get; set; }
 
     public UserList()
     {

diff --git a/ShoppingList/Services/KrogerAPIService.cs b/ShoppingList/Services/KrogerAPIService.cs
@@ -118,8 +118,7 @@ public async Task<Dictionary<string, string>> GetLocationNearZipAsync(string zip
         if (res.IsSuccessStatusCode)
         {
             string content = await res.Content.ReadAsStringAsync();
-            var fixedContent = content.Replace(@"\", String.Empty); 
-            var jsonRes = JsonSerializer.Deserialize<Root>(fixedContent);
+            var jsonRes = JsonSerializer.Deserialize<Root>(content);
 
             foreach(var jsonItem in jsonRes.data)
             {

diff --git a/ShoppingList/View/MainPage.xaml b/ShoppingList/View/MainPage.xaml
@@ -17,12 +17,18 @@
             <CollectionView.ItemTemplate >
                 <DataTemplate x:DataType="model:UserList">
                     <Grid Padding="10">
-                        <Frame HeightRequest="100">
+                        <Frame>
                             <Frame.GestureRecognizers>
                                 <TapGestureRecognizer CommandParameter="{Binding .}"
                                                       Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodel:UserListViewModel}}, Path=GoToListItemsCommand}"/>
                             </Frame.GestureRecognizers>
-                            <Label Text="{Binding Name}"/>
+                            <VerticalStackLayout>
+                                <Label Text="{Binding Name}"
+                                       FontSize="Medium"/>
+                                <Label Text="{Binding Type}"
+                                       FontSize="Micro"
+                                       Margin="25,0,0,0"/>
+                            </VerticalStackLayout>
                         </Frame>
                     </Grid>
                 </DataTemplate>
@@ -32,17 +38,17 @@
         <Button Text="Get UserLists"
                 Command="{Binding GetUserListsCommand}"
                 IsEnabled="{Binding IsNotBusy}"
-                TextColor="{StaticResource Primary}"
-                BackgroundColor="{StaticResource Secondary}"
+                TextColor="{StaticResource Secondary}"
+                BackgroundColor="{StaticResource Primary}"
                 Grid.Row="1"
                 Margin="8"/>
 
 
         <Button Text="Create New List"
                 Command="{Binding CreateUserListCommand}"
                 IsEnabled="{Binding IsNotBusy}"
-                TextColor="{StaticResource Primary}"
-                BackgroundColor="{StaticResource Secondary}"
+                TextColor="{StaticResource Secondary}"
+                BackgroundColor="{StaticResource Primary}"
                 Grid.Row="1"
                 Grid.Column="3"
                 Margin="8"/>

diff --git a/ShoppingList/View/UserListDataInput.xaml b/ShoppingList/View/UserListDataInput.xaml
@@ -27,6 +27,28 @@
                    ReturnCommand="{Binding UserListCompletedCommand}"/>
 
 
+            <HorizontalStackLayout>
+                <Label Text="Type of List: "
+                      TextColor="{StaticResource Primary}"
+                       Margin="0,5,5,0"/>
+
+                <Picker ItemsSource="{Binding TypeList}"
+                        SelectedIndexChanged="Picker_SelectedIndexChanged"
+                        TextColor="{StaticResource Primary}"
+                        SelectedIndex="0"/>
+
+            </HorizontalStackLayout>
+
+
+            <HorizontalStackLayout>
+                <Label Text="Pre-populate list with Items from last time?"
+                       TextColor="{StaticResource Primary}"/>
+
+                <CheckBox IsChecked="{Binding PrepopulateList}"
+                          Color="{StaticResource Primary}"/>
+
+            </HorizontalStackLayout>
+
         </StackLayout>
 
         <Button Text="Create New List"

diff --git a/ShoppingList/View/UserListDataInput.xaml.cs b/ShoppingList/View/UserListDataInput.xaml.cs
@@ -4,20 +4,23 @@ namespace ShoppingList;
 
 public partial class UserListDataInput : ContentPage
 {
+	private UserListDataInputViewModel _uldiv = new();
 
 	public UserListDataInput(UserListDataInputViewModel userListDataInputViewModel)
 	{
 		InitializeComponent();
 		BindingContext = userListDataInputViewModel;
+		_uldiv = userListDataInputViewModel; 
 
 	}
 
-/*	public void OnUserListNameCompleted(object sender, EventArgs e)
+	private void Picker_SelectedIndexChanged(object sender, EventArgs e)
 	{
-		string name = ((Entry)sender).Text;
+		var picker = sender as Picker;
 
-		Console.WriteLine(name);
-		Shell.Current.DisplayAlert("Your list name:", name, "Ok"); 
-	}*/
+
+		_uldiv.UserListType = (UserList.ListType) picker.SelectedIndex; 
+
+	}
 }
 
diff --git a/ShoppingList/View/UserListDetails.xaml.cs b/ShoppingList/View/UserListDetails.xaml.cs
@@ -17,11 +17,11 @@ public UserListDetails(UserListDetailViewModel userListDetailViewModel)
 
 	public void OnCheckboxClicked(object sender, CheckedChangedEventArgs e )
 	{
-		CheckBox thisCheckbox = (CheckBox)sender;
+		CheckBox thisCheckbox = sender as CheckBox;
 
-		Frame currentFrame = (Frame)(thisCheckbox).BindingContext;
+		Frame currentFrame = thisCheckbox.BindingContext as Frame;
 
-		Item itemThatWasClicked = (Item)(currentFrame).BindingContext;
+		Item itemThatWasClicked = currentFrame.BindingContext as Item;
 
 
 
@@ -30,7 +30,7 @@ public void OnCheckboxClicked(object sender, CheckedChangedEventArgs e )
 		else
 			currentFrame.FadeTo(1, 1000); 
 
-		itemThatWasClicked.IsCompleted = ((CheckBox)sender).IsChecked; 
+		itemThatWasClicked.IsCompleted = thisCheckbox.IsChecked; 
 		_ulvm.ItemWasChecked(itemThatWasClicked);
 
     }

diff --git a/ShoppingList/ViewModel/ItemInputViewModel.cs b/ShoppingList/ViewModel/ItemInputViewModel.cs
@@ -78,7 +78,7 @@ public async void OnItemEntryCompleted()
         newItem.LocationData.ParentId = newItem.Id; 
         UserList.Items.Add(newItem);
 
-        ListSorter.SortUserListItems(UserList);
+        //ListSorter.SortUserListItems(UserList);
         ListSorter.SortUserListItems(userList); 
 
         await Shell.Current.GoToAsync($"{nameof(UserListDetails)}?", true,

diff --git a/ShoppingList/ViewModel/UserListDataInputViewModel.cs b/ShoppingList/ViewModel/UserListDataInputViewModel.cs
@@ -22,17 +22,38 @@ public UserListDataInputViewModel()
         _userListService = new();
     }
 
+    public List<string> TypeList
+    {
+        get
+        {
+            return Enum.GetNames(typeof(UserList.ListType)).ToList(); 
+        }
+    }
+
+    [ObservableProperty]
+    public bool prepopulateList; 
+
+    [ObservableProperty]
+    private UserList.ListType userListType; 
+
 
     [RelayCommand]
     public async void OnUserListCompleted()
     {
         userList = new(); 
 
         userList.Name = UlName;
-        userList.TargetStore = ulTargetStore; 
+        userList.TargetStore = ulTargetStore;
+        userList.Type = UserListType; 
 
         userList = _userListService.CreateUserList(userList);
 
+        if (PrepopulateList)
+        {
+            Console.WriteLine("Yup"); 
+        }
+
+
         await Shell.Current.GoToAsync("..?id=" + userList.Id + "&createflag=true"); 
 
     }

diff --git a/ShoppingList/ViewModel/UserListDetailViewModel.cs b/ShoppingList/ViewModel/UserListDetailViewModel.cs
@@ -76,25 +76,15 @@ public void RefreshUserListDetailScreen()
 
         UserList.Items = _itemService.GetUserListItems(UserList); 
 
-        /*var apiConfig = await _krogerAPIService.GetStartupConfig();
-
-        var done = await _krogerAPIService.SetAuthTokens(apiConfig);
-
-        foreach (var item in UserList.Items)
-        {
-            ItemLocationData ild = await _krogerAPIService.GetProductInfo(item.Name, Preferences.Get("KrogerLocation", "0000000"), apiConfig);
-            item.LocationData = ild;
-        }*/
-
         ListSorter.SortUserListItems(userList); 
-        ListSorter.SortUserListItems(UserList);
-
+
         Items.Clear(); 
         foreach (var item in userList.Items)
         {
             Items.Add(item); 
         }
 
+        // Forces CollectionView to update on refresh, otherwise, it doesn't work!
         UserList = UserList; 
 
         IsRefreshing = false;