Merge branch 'dev' of https://github.com/Microsoft/UWPCommunityToolkit into blurFix

Author: shenchauhan

Microsoft.Toolkit.Uwp.SampleApp/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="52b9212c-97a9-4639-9426-3e1ea9c1569e" Publisher="CN=davca" Version="1.0.5.0" />
+  <Identity Name="52b9212c-97a9-4639-9426-3e1ea9c1569e" Publisher="CN=davca" Version="1.2.0.0" />
   <mp:PhoneIdentity PhoneProductId="52b9212c-97a9-4639-9426-3e1ea9c1569e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Microsoft.Toolkit.Uwp.SampleApp</DisplayName>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind

@@ -23,10 +23,11 @@
     </Page.Resources>
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <controls:AdaptiveGridView Name="control"
-                                     ItemHeight="@[ItemHeight:Slider:200:50-500]"
-                                     DesiredWidth="@[DesiredWidth:Slider:300:50-500]"
-                                     SelectionMode="@[SelectionMode:Enum:ListViewSelectionMode.Single]"
-                                     IsItemClickEnabled="@[IsItemClickEnabled:Bool:true]"
-                                     ItemTemplate="{StaticResource PhotosTemplate}"/>
+                                   OneRowModeEnabled="@[OneRowModeEnabled:Bool:false]"
+                                   ItemHeight="@[ItemHeight:Slider:200:50-500]"
+                                   DesiredWidth="@[DesiredWidth:Slider:300:50-500]"
+                                   SelectionMode="@[SelectionMode:Enum:ListViewSelectionMode.Single]"
+                                   IsItemClickEnabled="@[IsItemClickEnabled:Bool:true]"
+                                   ItemTemplate="{StaticResource PhotosTemplate}"/>
     </Grid>
 </Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml

@@ -39,6 +39,7 @@
 
     <controls:AdaptiveGridView x:Name="AdaptiveGridViewControl"
                                Grid.Row="1"
+                               OneRowModeEnabled="{Binding OneRowModeEnabled.Value}"
                                DesiredWidth="{Binding DesiredWidth.Value}"
                                IsItemClickEnabled="{Binding IsItemClickEnabled.Value, Mode=TwoWay}"
                                ItemHeight="{Binding ItemHeight.Value}"

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml

@@ -29,17 +29,19 @@
       </controls:MasterDetailsView.ItemTemplate>
       <controls:MasterDetailsView.DetailsTemplate>
         <DataTemplate>
-          <RelativePanel Margin="24">
+          <RelativePanel Margin="8">
             <Ellipse x:Name="FromEllipse"
                      Width="50"
                      Height="50"
                      Fill="Gray" />
-            <TextBlock Margin="12,-6,0,0"
+            <TextBlock Margin="12,10,0,0"
+                       VerticalAlignment="Center"
                        RelativePanel.RightOf="FromEllipse"
                        Style="{ThemeResource SubtitleTextBlockStyle}"
                        Text="{Binding From}" />
             <TextBlock x:Name="SubjectLine"
                        RelativePanel.Below="FromEllipse"
+                       Margin="0,12,0,0"
                        Style="{ThemeResource BodyTextBlockStyle}"
                        Text="{Binding Subject}" />
             <TextBlock x:Name="Body"

Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs

@@ -69,19 +69,7 @@ public partial class AdaptiveGridView
         private static void OnOneRowModeEnabledChanged(DependencyObject d, object newValue)
         {
             var self = d as AdaptiveGridView;
-
-            if ((bool)newValue)
-            {
-                var b = new Binding()
-                {
-                    Source = self,
-                    Path = new PropertyPath("ItemHeight")
-                };
-
-                self.SetBinding(GridView.MaxHeightProperty, b);
-                ScrollViewer.SetVerticalScrollMode(self, ScrollMode.Disabled);
-                ScrollViewer.SetVerticalScrollBarVisibility(self, ScrollBarVisibility.Hidden);
-            }
+            self.DetermineOneRowMode();
         }
 
         private static void DesiredWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.cs

@@ -30,6 +30,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// new column.</remarks>
     public partial class AdaptiveGridView : GridView
     {
+        private bool _isLoaded;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdaptiveGridView"/> class.
         /// </summary>
@@ -39,6 +41,8 @@ public AdaptiveGridView()
             SizeChanged += OnSizeChanged;
             ItemClick += OnItemClick;
             Items.VectorChanged += ItemsOnVectorChanged;
+            Loaded += OnLoaded;
+            Unloaded += OnUnloaded;
         }
 
         /// <summary>
@@ -134,6 +138,59 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs e)
             }
         }
 
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            _isLoaded = true;
+            DetermineOneRowMode();
+        }
+
+        private void OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            _isLoaded = false;
+        }
+
+        private void DetermineOneRowMode()
+        {
+            if (_isLoaded)
+            {
+                var itemsWrapGridPanel = ItemsPanelRoot as ItemsWrapGrid;
+
+                if (OneRowModeEnabled)
+                {
+                    var b = new Binding()
+                    {
+                        Source = this,
+                        Path = new PropertyPath("ItemHeight")
+                    };
+
+                    if (itemsWrapGridPanel != null)
+                    {
+                        itemsWrapGridPanel.Orientation = Orientation.Vertical;
+                    }
+
+                    this.SetBinding(GridView.MaxHeightProperty, b);
+
+                    ScrollViewer.SetVerticalScrollMode(this, ScrollMode.Disabled);
+                    ScrollViewer.SetVerticalScrollBarVisibility(this, ScrollBarVisibility.Disabled);
+                    ScrollViewer.SetHorizontalScrollBarVisibility(this, ScrollBarVisibility.Visible);
+                    ScrollViewer.SetHorizontalScrollMode(this, ScrollMode.Enabled);
+                }
+                else
+                {
+                    this.ClearValue(GridView.MaxHeightProperty);
+                    if (itemsWrapGridPanel != null)
+                    {
+                        itemsWrapGridPanel.Orientation = Orientation.Horizontal;
+                    }
+
+                    ScrollViewer.SetVerticalScrollMode(this, ScrollMode.Enabled);
+                    ScrollViewer.SetVerticalScrollBarVisibility(this, ScrollBarVisibility.Visible);
+                    ScrollViewer.SetHorizontalScrollBarVisibility(this, ScrollBarVisibility.Disabled);
+                    ScrollViewer.SetHorizontalScrollMode(this, ScrollMode.Disabled);
+                }
+            }
+        }
+
         private void RecalculateLayout(double containerWidth)
         {
             if (containerWidth > 0)