Browse Source

Interim Update

Frank van den Bos 1 year ago
parent
commit
2b8ef95149

+ 2 - 2
InABox.Mobile/InABox.Mobile.Shared/Components/MobilePage/MobilePage.xaml

@@ -99,7 +99,7 @@
             HeightRequest="80"
             WidthRequest="80">
         <xForms:SfBusyIndicator 
-            AnimationType="Box"
+            AnimationType="SingleCircle"
             x:Name="activity_indicator"
             VerticalOptions="CenterAndExpand"
             HorizontalOptions="CenterAndExpand"
@@ -107,7 +107,7 @@
             ViewBoxHeight="50"
             TextColor="White"
             IsBusy="False"
-            Duration="500"
+            Duration="200"
             />
         </mobile:MobileCard>
 

+ 3 - 1
InABox.Mobile/InABox.Mobile.Shared/Components/MobileToolGrid/MobileToolGrid.xaml

@@ -59,7 +59,9 @@
                             <Frame.Triggers>
                                 <DataTrigger TargetType="Frame" Binding="{Binding IsEnabled}" Value="False">
                                     <Setter Property="BackgroundColor" Value="LightGray" />
-                                    <Setter Property="BorderColor" Value="Gray" />
+                                </DataTrigger>
+                                <DataTrigger TargetType="Frame" Binding="{Binding AlertVisible}" Value="True">
+                                    <Setter Property="BackgroundColor" Value="LightSalmon" />
                                 </DataTrigger>
                             </Frame.Triggers>
                             <Frame.GestureRecognizers>

+ 10 - 6
InABox.Mobile/InABox.Mobile.Shared/DataModels/CoreRepository.cs

@@ -221,14 +221,13 @@ namespace InABox.Mobile
 
         private CoreTable _table = new CoreTable();
 
-        private readonly CoreObservableCollection<TItem> _items;
+        private CoreObservableCollection<TItem> _items;
         public IList<TItem> Items => _items;
         IEnumerable ICoreRepository.Items => Items;
         
-        
         #region Item Selection
         
-        private readonly CoreObservableCollection<TItem> _selectedItems = new CoreObservableCollection<TItem>();
+        private CoreObservableCollection<TItem> _selectedItems = new CoreObservableCollection<TItem>();
         public IEnumerable<TItem> SelectedItems => _selectedItems;
         IEnumerable ICoreRepository.SelectedItems => _selectedItems;
         
@@ -303,9 +302,14 @@ namespace InABox.Mobile
                 : SearchPredicate != null
                     ? new List<TItem>(_allitems.Where(SearchPredicate))
                     : new List<TItem>(_allitems);
-            _selectedItems.RemoveAll(x => !items.Contains(x));
-            _items.Clear();
-            _items.ReplaceRange(items);
+            
+            _selectedItems = new CoreObservableCollection<TItem>();
+            OnPropertyChanged(nameof(SelectedItems));
+            //_selectedItems.RemoveAll(x => !items.Contains(x));
+
+            _items = new CoreObservableCollection<TItem>(items);
+            //_items.Clear();
+            //_items.ReplaceRange(items);
             OnPropertyChanged(nameof(Items));
         }