Browse Source

Fixing Layout Issues
Correcting Crash when unable to get latest version number

Frank van den Bos 1 year ago
parent
commit
eb812085cb

+ 10 - 4
InABox.Core/Filter.cs

@@ -1751,10 +1751,16 @@ namespace InABox.Core
         {
         {
             Filter<T>? result = null;
             Filter<T>? result = null;
             foreach (var filter in filters)
             foreach (var filter in filters)
-                if (result is null)
-                    result = filter;
-                else
-                    result.Ands.Add(filter);
+            {
+                if (filter != null)
+                {
+                    if (result is null)
+                        result = filter;
+                    else
+                        result.Ands.Add(filter);
+                }
+            }
+
             return result;
             return result;
         }
         }
 
 

+ 4 - 1
InABox.Mobile/InABox.Mobile.Android/Version_Android.cs

@@ -55,8 +55,11 @@ namespace InABox.Mobile.Android
             }
             }
             catch (Exception e)
             catch (Exception e)
             {
             {
-                throw new LatestVersionException($"Error comparing current app version number with latest. Version name={_versionName} and lastest version={latestVersion} .", e);
+                MobileLogging.Log(e,"Version");
+                //throw new LatestVersionException($"Error comparing current app version number with latest. Version name={_versionName} and lastest version={latestVersion} .", e);
             }
             }
+
+            return true;
         }
         }
 
 
         /// <inheritdoc />
         /// <inheritdoc />

+ 1 - 0
InABox.Mobile/InABox.Mobile.Shared/Components/MobilePage/MobilePage.xaml

@@ -53,6 +53,7 @@
             <ui:MaterialLabel 
             <ui:MaterialLabel 
                 x:Name="_titleLabel"
                 x:Name="_titleLabel"
                 Grid.Column="2"
                 Grid.Column="2"
+                Margin="5,0,0,0"
                 Text="{Binding Title, Source={x:Reference _basepage}}" 
                 Text="{Binding Title, Source={x:Reference _basepage}}" 
                 TypeScale="H6"
                 TypeScale="H6"
                 FontAttributes="Bold"
                 FontAttributes="Bold"

+ 1 - 1
InABox.Mobile/InABox.Mobile.Shared/Components/MobileSearchBar/MobileSearchBar.xaml

@@ -13,7 +13,7 @@
             <Grid BackgroundColor="Transparent" Margin="0">
             <Grid BackgroundColor="Transparent" Margin="0">
                 
                 
                 <local:MobileCard
                 <local:MobileCard
-                    Padding="1,1,2,1" 
+                    Padding="3" 
                     BackgroundColor="{TemplateBinding TextBackgroundColor}"
                     BackgroundColor="{TemplateBinding TextBackgroundColor}"
                     BorderColor="{TemplateBinding BorderColor}"
                     BorderColor="{TemplateBinding BorderColor}"
                     IsClippedToBounds="True"
                     IsClippedToBounds="True"

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

@@ -82,11 +82,27 @@
                                     Grid.Column="0"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="2"
                                     Grid.ColumnSpan="2"
                                     Grid.RowSpan="2"
                                     Grid.RowSpan="2"
-                                    Margin="15,0"
                                     Source="{Binding Image}">
                                     Source="{Binding Image}">
                                     <Image.GestureRecognizers>
                                     <Image.GestureRecognizers>
                                         <TapGestureRecognizer Tapped="ImageTapped" />
                                         <TapGestureRecognizer Tapped="ImageTapped" />
                                     </Image.GestureRecognizers>
                                     </Image.GestureRecognizers>
+                                    <Image.Margin>
+                                        <OnIdiom x:TypeArguments="Thickness">
+                                            <OnIdiom.Phone>
+                                                <OnPlatform x:TypeArguments="Thickness">
+                                                    <On Platform="iOS" Value="15,0"/>
+                                                    <On Platform="Android" Value="15,0"/>
+                                                </OnPlatform>
+                                            </OnIdiom.Phone>
+                                            <OnIdiom.Tablet>
+                                                <OnPlatform x:TypeArguments="Thickness">
+                                                    <On Platform="iOS" Value="30,15"/>
+                                                    <On Platform="Android" Value="30,15"/>
+                                                </OnPlatform>
+                                            </OnIdiom.Tablet>
+                                        </OnIdiom>
+                                    </Image.Margin>
+                   
                                 </Image>
                                 </Image>
                                 
                                 
                                 <Frame 
                                 <Frame