Latest UI updates

IsaacMorris1980 · Aug 19, 2022 · 0ebfb2d · 0ebfb2d
1 parent 11a5b71
commit 0ebfb2d
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 29 deletions.
diff --git a/ShoppingList/Controls/CircularButton.cs b/ShoppingList/Controls/CircularButton.cs
@@ -40,7 +40,7 @@ public string Image
 
 	public new BindableProperty IsVisibleProperty = BindableProperty.Create(
 		nameof(IsVisible), typeof(bool), typeof(CircularButton),
-		propertyChanging: OnIsVisibleChanged); 
+		propertyChanged: OnIsVisibleChanged); 
 
 	public CircularButton()
 	{

diff --git a/ShoppingList/Controls/StringToBoolConverter.cs b/ShoppingList/Controls/StringToBoolConverter.cs
@@ -0,0 +1,32 @@
+using System.Globalization;
+
+namespace ShoppingList.Controls;
+
+public class StringToBoolConverter : IValueConverter 
+{
+	public StringToBoolConverter() 
+	{
+
+	}
+
+	public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		Console.WriteLine("Test");
+		var asString = (string)value; 
+		if (value is not null)
+		{
+			var result = Boolean.Parse(asString);
+			return result;
+		}
+		else
+		{
+			return false; 
+		}
+	}
+
+	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		Console.WriteLine("Test");
+		return null; 
+	}
+}
diff --git a/ShoppingList/Drawable/CircularButtonDrawable.cs b/ShoppingList/Drawable/CircularButtonDrawable.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reflection;
-using Microsoft.Maui.Graphics.Platform;
 using IImage = Microsoft.Maui.Graphics.IImage;
 
 namespace ShoppingList.Drawable;
@@ -39,12 +38,15 @@ public void Draw(ICanvas canvas, RectF dirtyRect)
         var limitingDim = width > height ? height : width;
         PointF centerOfCircle = new PointF(width / 2, height / 2);
 
-#if !WINDOWS
+#if WINDOWS
+        canvas.FillColor = this.ButtonColor;
+        canvas.FillCircle(centerOfCircle, limitingDim / 2);
+#elif ANDROID || IOS
         IImage image;
         Assembly assembly = GetType().GetTypeInfo().Assembly;
         using (Stream stream = assembly.GetManifestResourceStream("ShoppingList.Resources.Images." + Image))
         {
-            image = PlatformImage.FromStream(stream);
+            image =  Microsoft.Maui.Graphics.Platform.PlatformImage.FromStream(stream);
             if (image is null)
                 throw new FileNotFoundException("ShoppingList.Resources.Images." + Image); 
         }
@@ -54,11 +56,6 @@ public void Draw(ICanvas canvas, RectF dirtyRect)
             canvas.FillCircle(centerOfCircle, limitingDim / 2);
             canvas.DrawImage(image, dirtyRect.X + dirtyRect.Width / 4, dirtyRect.Y + dirtyRect.Height / 4, dirtyRect.Width / 2, dirtyRect.Height / 2); 
         }
-#else
-
-        canvas.FillColor = this.ButtonColor;
-        canvas.FillCircle(centerOfCircle, limitingDim / 2);
-
 #endif
     }
 }

diff --git a/ShoppingList/Platforms/iOS/Entitlements.plist b/ShoppingList/Platforms/iOS/Entitlements.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.security.application-groups</key>
-	<string>group.dev.programmingwithchris.ShoppingList</string>
-	<key>com.apple.developer.default-data-protection</key>
-	<string>NSFileProtectionComplete</string>
 	<key>com.apple.security.inherit</key>
 	<true/>
 	<key>get-task-allow</key>

diff --git a/ShoppingList/Platforms/iOS/Info.plist b/ShoppingList/Platforms/iOS/Info.plist
@@ -25,5 +25,7 @@
 	</array>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/appicon.appiconset</string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
 </dict>
 </plist>
diff --git a/ShoppingList/View/MainPage.xaml b/ShoppingList/View/MainPage.xaml
@@ -4,8 +4,10 @@
              xmlns:model="clr-namespace:ShoppingList.Model"
              xmlns:viewmodel="clr-namespace:ShoppingList.ViewModels"
              xmlns:skiasharp="clr-namespace:SkiaSharp.Extended.UI.Controls;assembly=SkiaSharp.Extended.UI"
+             xmlns:controls="clr-namespace:ShoppingList.Controls"
              x:DataType="viewmodel:UserListViewModel"
              Title="{Binding Title}"
+             x:Name="CurrentPage"
              BackgroundColor="{DynamicResource Secondary}"
              x:Class="ShoppingList.MainPage">
 
@@ -73,21 +75,35 @@
 				                BackgroundColor="Transparent">
         </skiasharp:SKLottieView>
 
-        <Button Text="Get UserLists"
-                Command="{Binding GetUserListsCommand}"
-                IsEnabled="{Binding IsNotBusy}"
-                BackgroundColor="{DynamicResource Primary}"
-                Grid.Row="1"
-                Margin="8"/>
 
 
-        <Button Text="Create New List"
+            <controls:CircularButton  
+			            Grid.Row="1"
+			            Grid.Column="3"
+                        x:Name="NewItemButton"
+                        WidthRequest="75"
+                        HeightRequest="75"
+                        Margin="0,0,45,45"
+                        ButtonColor="{StaticResource Tertiary}"
+                        BackgroundColor="Transparent"
+                        Image="plus_sign.png"
+                        VerticalOptions="End"
+                        HorizontalOptions="End"
+			            >
+                <GraphicsView.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding CreateUserListCommand}"/>
+
+                </GraphicsView.GestureRecognizers>
+            </controls:CircularButton>
+
+
+        <!--<Button Text="Create New List"
                 Command="{Binding CreateUserListCommand}"
                 IsEnabled="{Binding IsNotBusy}"
                 BackgroundColor="{DynamicResource Primary}"
                 Grid.Row="1"
                 Grid.Column="3"
-                Margin="8"/>
+                Margin="8"/>-->
 
         <ActivityIndicator IsVisible="{Binding IsBusy}"
                            IsRunning="{Binding IsBusy}"

diff --git a/ShoppingList/View/SettingsView.xaml b/ShoppingList/View/SettingsView.xaml
@@ -51,6 +51,7 @@
                 <Label Text="Default Kroger Location:"
                        Margin="0,0,25,0"/>
                 <Label Text="{Binding KrogerStoreName}"
+                       BackgroundColor="{DynamicResource Primary}"
                        >
                     <Label.GestureRecognizers>
                         <TapGestureRecognizer Command="{Binding OpenLocationFinderDialogCommand}"/>

diff --git a/ShoppingList/View/UserListDetails.xaml b/ShoppingList/View/UserListDetails.xaml
@@ -10,6 +10,10 @@
              Title="{Binding Title}"
              >
 
+    <ContentPage.Resources>
+        <controls:StringToBoolConverter x:Key="stringToBool" />
+    </ContentPage.Resources>
+
     <Shell.BackButtonBehavior>
         <BackButtonBehavior Command="{Binding GoBackToListScreenCommand}"
             />
@@ -50,7 +54,7 @@
                             </SwipeItems>
                         </SwipeView.RightItems>
                             <Frame Grid.ColumnSpan="3"
-                               Padding="10"
+                               Padding="5"
                                Margin="0,0,0,10"
                                x:Name="ItemFrame"
                                BindingContext="{Binding .}">
@@ -110,10 +114,9 @@
                         VerticalOptions="End"
                         HorizontalOptions="End"
 			            >
-                <GraphicsView.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding NewItemDialogCommand}"/>
-
-                </GraphicsView.GestureRecognizers>
+                <controls:CircularButton.GestureRecognizers>
+                    <TapGestureRecognizer Tapped="NewItemButtonPressed"/>
+                </controls:CircularButton.GestureRecognizers>
             </controls:CircularButton>
 
 
@@ -131,10 +134,9 @@
                         IsEnabled="{Binding HasUndo}"
                         IsVisible="{Binding HasUndo}"
 			            >
-                <GraphicsView.GestureRecognizers>
+                <controls:CircularButton.GestureRecognizers>
                     <TapGestureRecognizer Command="{Binding UndoButtonPressedCommand}"/>
-
-                </GraphicsView.GestureRecognizers>
+                </controls:CircularButton.GestureRecognizers>
             </controls:CircularButton>
         </Grid>
     </Grid>

diff --git a/ShoppingList/View/UserListDetails.xaml.cs b/ShoppingList/View/UserListDetails.xaml.cs
@@ -42,4 +42,15 @@ public void OnCheckboxClicked(object sender, CheckedChangedEventArgs e)
 
 	}
 
+	public void NewItemButtonPressed(object sender, EventArgs e)
+	{
+
+		var circularButton = sender as CircularButton;
+		//need to grab the drawable, add a method in the drawable to animate a scale, and then call it here
+
+		_ulvm.NewItemDialog(); 
+
+
+	}
+
 }