Merge remote-tracking branch 'origin/frank' into kenric

InABox.Mobile/InABox.Mobile.Shared/Components/MobileButtonStrip/MobileButtonStrip.xaml

@@ -7,49 +7,50 @@
 
     
     <ContentView.Content>
-        
-        <StackLayout Orientation="Horizontal"  
-            x:Name="_list"
-            BackgroundColor="{Binding Source={RelativeSource Self}, Path=BackgroundColor}"
-            HeightRequest="40">
-            <BindableLayout.ItemTemplate>
-                <DataTemplate x:DataType="mobile:MobileButtonStripItem">
-                    
-                    <mobile:MobileCard 
-                        BorderColor="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=BorderColor}"
-                        BackgroundColor="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=UnselectedBackgroundColor}">
+        <ScrollView Orientation="Horizontal">
+            
+            <StackLayout Orientation="Horizontal"  
+                x:Name="_list"
+                BackgroundColor="{Binding Source={RelativeSource Self}, Path=BackgroundColor}"
+                HeightRequest="40">
+                <BindableLayout.ItemTemplate>
+                    <DataTemplate x:DataType="mobile:MobileButtonStripItem">
+                        
+                        <mobile:MobileCard 
+                            BorderColor="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=BorderColor}"
+                            BackgroundColor="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=UnselectedBackgroundColor}">
 
-                        <mobile:MobileCard.Triggers>
-                            <DataTrigger TargetType="mobile:MobileCard" Binding="{Binding Selected}" Value="True">
-                                <Setter Property="BackgroundColor" Value="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=SelectedBackgroundColor}" />
-                            </DataTrigger>
-                        </mobile:MobileCard.Triggers>
-                    
-                        <Label
-                            x:Name="_label"
-                            Text="{Binding Text}"
-                            FontSize="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=FontSize}"
-                            FontAttributes="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=FontAttributes}"
-                            HorizontalTextAlignment="Center"
-                            VerticalTextAlignment="Center"
-                            BackgroundColor="Transparent"
-                            TextColor="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=UnselectedForegroundColor}"
-                            Margin="5,0">
-                            <Label.GestureRecognizers>
-                                <TapGestureRecognizer Tapped="DoTap" />
-                            </Label.GestureRecognizers>
-                            <Label.Triggers>
-                                <DataTrigger TargetType="Label" Binding="{Binding Selected}" Value="True">
-                                    <Setter Property="TextColor" Value="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=SelectedForegroundColor}" />
+                            <mobile:MobileCard.Triggers>
+                                <DataTrigger TargetType="mobile:MobileCard" Binding="{Binding Selected}" Value="True">
+                                    <Setter Property="BackgroundColor" Value="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=SelectedBackgroundColor}" />
                                 </DataTrigger>
-                            </Label.Triggers>
-                        </Label>
-                    </mobile:MobileCard>
-                </DataTemplate>
-            </BindableLayout.ItemTemplate>
-        </StackLayout>
-
+                            </mobile:MobileCard.Triggers>
+                        
+                            <Label
+                                x:Name="_label"
+                                Text="{Binding Text}"
+                                FontSize="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=FontSize}"
+                                FontAttributes="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=FontAttributes}"
+                                HorizontalTextAlignment="Center"
+                                VerticalTextAlignment="Center"
+                                BackgroundColor="Transparent"
+                                TextColor="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=UnselectedForegroundColor}"
+                                Margin="5,0">
+                                <Label.GestureRecognizers>
+                                    <TapGestureRecognizer Tapped="DoTap" />
+                                </Label.GestureRecognizers>
+                                <Label.Triggers>
+                                    <DataTrigger TargetType="Label" Binding="{Binding Selected}" Value="True">
+                                        <Setter Property="TextColor" Value="{Binding Source={RelativeSource AncestorType={x:Type mobile:MobileButtonStrip}}, Path=SelectedForegroundColor}" />
+                                    </DataTrigger>
+                                </Label.Triggers>
+                            </Label>
+                        </mobile:MobileCard>
+                    </DataTemplate>
+                </BindableLayout.ItemTemplate>
+            </StackLayout>
 
+        </ScrollView>
         
     </ContentView.Content>
     

InABox.Mobile/InABox.Mobile.Shared/Components/MobilePage/MobilePage.xaml

@@ -21,7 +21,7 @@
         <Grid.Margin>
             <OnPlatform x:TypeArguments="Thickness">
                 <OnPlatform.Platforms>
-                    <On Platform="iOS" Value="0,-5,0,0" />
+                    <On Platform="iOS" Value="0,0,0,0" />
                     <On Platform="Android" Value="0,0,0,0" />
                 </OnPlatform.Platforms>
             </OnPlatform>

InABox.Mobile/InABox.Mobile.Shared/DataModels/CoreRepository.cs

@@ -12,8 +12,10 @@ using InABox.Configuration;
 using InABox.Core;
 using InABox.Mobile.Shared;
 using JetBrains.Annotations;
+using Syncfusion.SfDataGrid.XForms;
 using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
+using Columns = InABox.Core.Columns;
 
 namespace InABox.Mobile
 {
@@ -30,14 +32,31 @@ namespace InABox.Mobile
 
     public delegate void CoreRepositoryItemCreatedEvent<TShell>(object sender, CoreRepositoryItemCreatedArgs<TShell> args);
 
-    public class CoreRepository
+    public abstract class CoreRepository
     {
+
+        
+        public static string CacheFileName<T>() => typeof(T).EntityName().Split('.').Last();
+        public static string CacheFileName<T>(string postfix)
+        {
+            var result = CacheFileName<T>();
+            if (!string.IsNullOrWhiteSpace(postfix))
+                result = $"{result}_{postfix}";
+            return result;
+        }
+        
+
+
+        [CanBeNull] public abstract string FileName();
+
+        public bool IsCached() => CoreRepository.IsCached(FileName());
+        
         public static bool IsCached(string filename) => 
             !String.IsNullOrWhiteSpace(filename) 
             && File.Exists(CacheFileName(filename));
         
         public static string CacheFileName(string filename) =>
-            Path.Combine(CacheFolder(), filename);
+            Path.Combine(CacheFolder(), $"{filename}.cache");
 
         public static string CacheFolder()
         {
@@ -68,10 +87,9 @@ namespace InABox.Mobile
         
         public DateTime LastUpdated { get; protected set; }
         
-        public String FileName { get; set; }
-
+        [CanBeNull] private Func<string> _cacheFileName { get; set; }
         
-        protected CoreRepository(IModelHost host, Func<Filter<TEntity>> filter)
+        protected CoreRepository(IModelHost host, [CanBeNull] Func<Filter<TEntity>> filter = null, [CanBeNull] Func<string> cachefilename = null)
         {
             AllItems = new ObservableRangeCollection<TItem>();
             AllItems.CollectionChanged += (sender, args) => ItemsChanged(AllItems);
@@ -86,8 +104,12 @@ namespace InABox.Mobile
             Reset();
             Host = host;
             Filter = filter;
+            _cacheFileName = cachefilename;
         }
 
+        [CanBeNull] public override string FileName() => _cacheFileName?.Invoke();
+
+
         protected virtual void ItemsChanged(IEnumerable<TItem> items)
         {
         }
@@ -152,9 +174,15 @@ namespace InABox.Mobile
         
         public CoreFilterDefinitions AvailableFilters()
         {
-            return string.IsNullOrWhiteSpace(FilterTag)
-                ? new CoreFilterDefinitions()
-                : new GlobalConfiguration<CoreFilterDefinitions>(FilterTag).Load();
+            var result = new CoreFilterDefinitions();
+            if (!string.IsNullOrWhiteSpace(FilterTag))
+            {
+                var mobile = new GlobalConfiguration<CoreFilterDefinitions>(FilterTag)
+                    .Load()
+                    .Where(x => x.Visibility == CoreFilterDefinitionVisibility.DesktopAndMobile);
+                result.AddRange(mobile);
+            }
+            return result;
         }
 
         protected Filter<TEntity> SelectedFilter;
@@ -200,7 +228,7 @@ namespace InABox.Mobile
             Items.Clear();
             SelectedItems.Clear();
 
-            if (!Loaded && CoreRepository.IsCached(FileName))
+            if (!Loaded && IsCached(FileName()))
             {
                 DoBeforeLoad();
                 if (LoadFromStorage())
@@ -505,13 +533,14 @@ namespace InABox.Mobile
         
         protected bool LoadFromStorage()
         {
-            if (String.IsNullOrWhiteSpace(FileName))
+            
+            if (String.IsNullOrWhiteSpace(FileName()))
             {
                 InitializeTables();
                 return true;
             }
             
-            var file = CacheFileName(FileName);
+            var file = CacheFileName(FileName());
             if (File.Exists(file))
             {
                 LastUpdated = File.GetLastWriteTime(file);
@@ -551,7 +580,7 @@ namespace InABox.Mobile
 
         protected void SaveToStorage()
         {
-            if (String.IsNullOrWhiteSpace(FileName))
+            if (String.IsNullOrWhiteSpace(FileName()))
                 return;
             
             QueryStorage storage = new QueryStorage();
@@ -561,8 +590,9 @@ namespace InABox.Mobile
             var data = storage.WriteBinary(BinarySerializationSettings.Latest);
             try
             {
-                var file = CacheFileName(FileName);
-                File.WriteAllBytes(file,data);
+                var file = $"{CacheFileName(FileName())}";
+                if (!string.IsNullOrWhiteSpace(file))
+                    File.WriteAllBytes(file,data);
             }
             catch (Exception e)
             {

inabox.wpf/Editors/TextEdit.xaml

@@ -17,10 +17,11 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
         <Label Grid.Row="0"
+               x:Name="Prompt"
                Grid.Column="0"
                VerticalContentAlignment="Center"
                Content="Enter Text:">

inabox.wpf/Editors/TextEdit.xaml.cs

@@ -17,6 +17,15 @@ namespace InABox.Wpf.Editors
             TextEditor.Text = text;
         }
 
+        public TextEdit(string caption, string prompt, string text = "")
+        {
+            InitializeComponent();
+
+            Title = caption;
+            Prompt.Content = prompt;
+            TextEditor.Text = text;
+        }
+        
         public string Text
         {
             get => TextEditor.Text;
@@ -46,6 +55,18 @@ namespace InABox.Wpf.Editors
 
             return false;
         }
+        
+        public static bool Execute(string caption, string prompt, ref string text)
+        {
+            var editor = new TextEdit(caption, prompt, text);
+            if (editor.ShowDialog() == true)
+            {
+                text = editor.Text;
+                return true;
+            }
+
+            return false;
+        }
 
         private void ThemableWindow_Loaded(object sender, RoutedEventArgs e)
         {