layout projection

fuzzzerd · Sep 27, 2019 · 7a2c3fd · 7a2c3fd
1 parent adc3c32
commit 7a2c3fd
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 19 deletions.
diff --git a/SharpFM.App/App.xaml.cs b/SharpFM.App/App.xaml.cs
@@ -1,26 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
 namespace SharpFM.App
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
     /// </summary>
-    sealed partial class App : Application
+    public sealed partial class App : Application
     {
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code

diff --git a/SharpFM.App/LayoutClipPicker.xaml b/SharpFM.App/LayoutClipPicker.xaml
@@ -0,0 +1,18 @@
+<ContentDialog
+    x:Class="SharpFM.App.LayoutClipPicker"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:SharpFM.App"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Title="TITLE"
+    PrimaryButtonText="Select"
+    SecondaryButtonText="Cancel"
+    PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
+    SecondaryButtonClick="ContentDialog_SecondaryButtonClick">
+
+    <Grid>
+        <ComboBox x:Name="LayoutPickerCombo" HorizontalAlignment="Stretch" Margin="0,0,10,0" ItemsSource="{Binding Layouts}" DisplayMemberPath="Name" />
+    </Grid>
+</ContentDialog>
diff --git a/SharpFM.App/LayoutClipPicker.xaml.cs b/SharpFM.App/LayoutClipPicker.xaml.cs
@@ -0,0 +1,39 @@
+using SharpFM.Core;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace SharpFM.App
+{
+    public sealed partial class LayoutClipPicker : ContentDialog
+    {
+        public FileMakerClip DialogResult { get; private set; }
+
+        public LayoutClipPicker()
+        {
+            this.InitializeComponent();
+        }
+
+        private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            DialogResult = LayoutPickerCombo.SelectedItem as FileMakerClip;
+        }
+
+        private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+        }
+    }
+}
diff --git a/SharpFM.App/MainPage.xaml.cs b/SharpFM.App/MainPage.xaml.cs
@@ -5,8 +5,10 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage.Streams;
+using Windows.UI.Popups;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -20,6 +22,13 @@ namespace SharpFM.App
     public sealed partial class MainPage : Page
     {
         public ObservableCollection<FileMakerClip> Keys { get; }
+        public ObservableCollection<FileMakerClip> Layouts
+        {
+            get
+            {
+                return new ObservableCollection<FileMakerClip>(Keys.Where(k => FileMakerClip.ClipTypes[k.ClipboardFormat] == "Layout"));
+            }
+        }
 
         public MainPage()
         {
@@ -108,15 +117,43 @@ private void masterNewScript_Click(object sender, RoutedEventArgs e)
             Keys.Add(new FileMakerClip("", "Mac-XMSS", Array.Empty<byte>()));
         }
 
-        private void asModelAppBarButton_Click(object sender, RoutedEventArgs e)
+        private async void asModelAppBarButton_Click(object sender, RoutedEventArgs e)
         {
+            // TODO: improve the UX of this whole thing. This works as a hack for proving the concept, but it could be so much better.
+
             var data = mdv.SelectedItem as FileMakerClip;
-            var classString = data.CreateClass();
 
-            var dp = new DataPackage();
-            dp.SetText(classString);
-            Clipboard.SetContent(dp);
-            Clipboard.Flush();
+            var md = new MessageDialog("Do you want to use a layout to limit the number of fields in the generated model?", "Use Layout Projection?");
+            // setup the command that will show the Layout picker and generate content that way
+            md.Commands.Add(new UICommand("Pick a Layout", new UICommandInvokedHandler(async uic =>
+            {
+                var picker = new LayoutClipPicker
+                {
+                    DataContext = this.DataContext
+                };
+                var pickerResult = await picker.ShowAsync(ContentDialogPlacement.InPlace);
+                if (pickerResult == ContentDialogResult.Primary)
+                {
+                    // regenerate using the layout picker
+                    var classString = data.CreateClass(picker.DialogResult);
+                    var dp = new DataPackage();
+                    dp.SetText(classString);
+                    Clipboard.SetContent(dp);
+                    Clipboard.Flush();
+                }
+            })));
+
+            // setup the command that will generate the full model
+            md.Commands.Add(new UICommand("No Projection", new UICommandInvokedHandler(uic =>
+            {
+                var classString = data.CreateClass();
+                var dp = new DataPackage();
+                dp.SetText(classString);
+                Clipboard.SetContent(dp);
+                Clipboard.Flush();
+            })));
+
+            var result = await md.ShowAsync();
         }
     }
 }
diff --git a/SharpFM.App/SharpFM.App.csproj b/SharpFM.App/SharpFM.App.csproj
@@ -102,6 +102,9 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
+    <Compile Include="LayoutClipPicker.xaml.cs">
+      <DependentUpon>LayoutClipPicker.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
@@ -127,6 +130,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Page Include="LayoutClipPicker.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/SharpFM.Core/FileMakerClip.cs b/SharpFM.Core/FileMakerClip.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Linq;
 
@@ -110,7 +111,7 @@ public IEnumerable<FileMakerField> Fields
                             .Where(x => x.Attribute("type").Value == "Field")
                             .Descendants("FieldObj")
                             .Elements("Name")
-                            .Select(x => new FileMakerField { Name = x.Value });
+                            .Select(x => new FileMakerField { Name = Regex.Split(x.Value, "::")[1]});
                 }
 
                 // return emptyl ist of we don't have a matching type

diff --git a/SharpFM.Core/FileMakerClipExtensions.cs b/SharpFM.Core/FileMakerClipExtensions.cs
@@ -15,7 +15,7 @@ public static class FileMakerClipExtensions
         public static string CreateClass(this FileMakerClip _clip, FileMakerClip fieldProjectionLayout = null)
         {
             var fieldProjectionList = new List<string>();
-            if (fieldProjectionLayout != null && fieldProjectionLayout.ClipboardFormat == "Layout")
+            if (fieldProjectionLayout != null && FileMakerClip.ClipTypes[fieldProjectionLayout.ClipboardFormat] == "Layout")
             {
                 // a clip that is of type layout, only has name attribute (since the rest isn't available)
                 // and we only need the name to skip it down below