Skip to content

Commit 36d4445

Browse files
Luke BlevinsLuke Blevins
authored andcommitted
Further Tweaks to YourHome UI
1 parent f574f1b commit 36d4445

File tree

3 files changed

+33
-23
lines changed

3 files changed

+33
-23
lines changed

Assets/Cards/pictures.jpg

0 Bytes
Loading

LocationsList.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class LocationItem
1010
public string ImageSource { get; set; }
1111
public string Icon { get; set; }
1212
public string Text { get; set; }
13+
public string DominantImageColor { get; set; }
1314
}
1415

1516
public class ItemLoader
@@ -28,7 +29,7 @@ public static void DisplayItems()
2829
itemsAdded.Add(new LocationItem() { ImageSource = "Assets/Cards/pictures.jpg", Icon = "", Text = "Pictures" });
2930
itemsAdded.Add(new LocationItem() { ImageSource = "Assets/Cards/music.jpg", Icon = "", Text = "Music" });
3031
itemsAdded.Add(new LocationItem() { ImageSource = "Assets/Cards/videos.jpg", Icon = "", Text = "Videos" });
31-
32+
// Eventually, pull dominant color from image and style dropshadowpanel accordingly
3233

3334

3435

YourHome.xaml

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@
4848
</VisualState>
4949
<VisualState x:Name="PointerOver">
5050
<VisualState.Setters>
51-
51+
5252
<Setter Target="ContentPresenter.BorderBrush" Value="Transparent"/>
5353
</VisualState.Setters>
5454
</VisualState>
5555
<VisualState x:Name="Pressed">
5656

5757
<Storyboard>
58-
58+
5959
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
6060
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
6161
</ObjectAnimationUsingKeyFrames>
62-
62+
6363
<PointerDownThemeAnimation Storyboard.TargetName="RootGrid"/>
6464
</Storyboard>
6565
</VisualState>
@@ -378,45 +378,54 @@
378378
</Page.Resources>
379379

380380
<Grid Padding="50,0,50,0" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
381+
381382
<Grid.RowDefinitions>
382383
<RowDefinition Height="15*"/>
383384
<RowDefinition Height="Auto"/>
384385
<RowDefinition Height="55*"/>
385386
</Grid.RowDefinitions>
386-
<TextBlock Padding="0,0,0,5" FontFamily="Segoe UI" FontSize="36" FontWeight="Bold" Text="Locations" VerticalAlignment="Bottom"/>
387-
<controls:AdaptiveGridView ItemContainerStyle="{StaticResource AdaptiveGridViewItemContainerStyle2}" ItemsSource="{x:Bind list:ItemLoader.itemsAdded}" Padding="0,0,10,0" OneRowModeEnabled="True" ItemHeight="200" DesiredWidth="200" VerticalAlignment="Stretch" Grid.Row="1" HorizontalAlignment="Stretch" Margin="0,0,0,0">
387+
<TextBlock Padding="0,0,0,5" FontFamily="Segoe UI" FontSize="32" FontWeight="Bold" Text="Locations" VerticalAlignment="Bottom" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" Margin="50,0,50,0"/>
388+
<controls:AdaptiveGridView ItemContainerStyle="{StaticResource AdaptiveGridViewItemContainerStyle2}" ItemsSource="{x:Bind list:ItemLoader.itemsAdded}" Padding="0,0,10,0" OneRowModeEnabled="True" ItemHeight="210" DesiredWidth="175" Grid.Row="1" Margin="50,0,50,0" Grid.ColumnSpan="2">
388389
<controls:AdaptiveGridView.ItemTemplate>
389390
<DataTemplate>
390-
<Button Style="{ThemeResource CardStyle}" Margin="0,0,0,0" Click="b1_Click" Background="{x:Null}" Padding="0,0,0,0">
391+
<Button Style="{ThemeResource CardStyle}" Margin="0,0,0,0" Click="b1_Click" Background="{x:Null}" Padding="0,0,0,0">
392+
393+
<Grid Margin="2">
394+
<StackPanel Orientation="Vertical">
395+
396+
397+
<controls:DropShadowPanel OffsetX="7.50" OffsetY="7.50" Color="{Binding }" ShadowOpacity="0.15" BlurRadius="10" Height="175" Width="175">
398+
<Rectangle Width="175" Height="175" RadiusX="10" RadiusY="10">
399+
<Rectangle.Fill>
400+
<ImageBrush Stretch="UniformToFill" ImageSource="{Binding ImageSource}"/>
401+
</Rectangle.Fill>
402+
</Rectangle>
403+
</controls:DropShadowPanel>
391404

392-
<Grid>
393-
<StackPanel Orientation="Vertical">
394-
395-
<Grid MaxHeight="175" CornerRadius="10" Canvas.ZIndex="3">
396-
397-
<Image Source="{Binding ImageSource}" Stretch="UniformToFill"/>
398-
399-
</Grid>
400-
401-
402-
<TextBlock Text="{Binding Text}" Name="ItemLocationName" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" HorizontalAlignment="Left" />
405+
406+
407+
<TextBlock Margin="0,5,0,0" Text="{Binding Text}" Name="ItemLocationName" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" HorizontalAlignment="Left" />
403408
</StackPanel>
404409
</Grid>
405410
</Button>
406411
</DataTemplate>
407-
412+
408413
</controls:AdaptiveGridView.ItemTemplate>
409-
414+
410415
</controls:AdaptiveGridView>
411416

412-
<ScrollViewer HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto" VerticalScrollMode="Auto" VerticalAlignment="Top" Grid.Row="2" HorizontalAlignment="Stretch" Margin="50,0,50,0">
413-
<ListView Name="RecentsView" MinHeight="350" HorizontalAlignment="Stretch" Padding="0,50,0,0" >
417+
<Grid VerticalAlignment="Stretch" Grid.Row="2" HorizontalAlignment="Stretch" Margin="50,25,75,0">
418+
<StackPanel>
419+
<TextBlock FontFamily="Segoe UI" FontWeight="Bold" FontSize="30" Text="Recent Files"/>
420+
<ScrollViewer HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto" VerticalScrollMode="Auto" >
421+
<ListView Name="RecentsView" MinHeight="400" HorizontalAlignment="Stretch" Padding="0,50,0,0" >
414422
<ListView.Header>
415423
<TextBlock Text="No recent files" HorizontalAlignment="Center" FontSize="24"/>
416424
</ListView.Header>
417425
</ListView>
418426
</ScrollViewer>
419-
427+
</StackPanel>
428+
</Grid>
420429

421430

422431

0 commit comments

Comments
 (0)