Design tweaks

src/Kliva/Controls/AppInfoDialog.xaml

@@ -6,12 +6,46 @@
  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
  mc:Ignorable="d"
- Title="TITLE"
- PrimaryButtonText="Button1"
- SecondaryButtonText="Button2"
- PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
- SecondaryButtonClick="ContentDialog_SecondaryButtonClick">
+ Title="Kliva - info">
 
- <Grid>
- </Grid>
-</ContentDialog>
+ <ContentDialog.Resources>
+ <CollectionViewSource x:Name="GroupedAppInfoOverviewItems"
+ Source="{Binding CurrentVersion.OverviewItems, Mode=OneWay}"
+ IsSourceGrouped="True"
+ ItemsPath="Items" />
+ </ContentDialog.Resources>
+
+ <RelativePanel>
+ <TextBlock x:Name="CurrentVersionTextBlock" Style="{StaticResource BaseTextBlock}">
+ <Bold>
+ <Run FontSize="18" Text="{Binding CurrentVersion.Version, Mode=OneWay}" Foreground="{StaticResource KlivaDarkBrush}"/>
+ </Bold>
+ <LineBreak />
+ <Run Text="version" FontSize="12" Foreground="{StaticResource SubTextBrush}"/>
+ </TextBlock>
+
+ <TextBlock x:Name="GeneralInfoTextBlock"
+ Style="{StaticResource BaseTextBlock}"
+ Padding="0,10,0,5"
+ TextWrapping="Wrap"
+ RelativePanel.Below="CurrentVersionTextBlock">
+ <Run Text="{Binding CurrentVersion.GeneralInfo, Mode=OneWay}" />
+ </TextBlock>
+
+ <ListView x:Name="AppInfoOverviewItemsList"
+ ItemsSource="{Binding Source={StaticResource GroupedAppInfoOverviewItems}}"
+ ItemTemplate="{StaticResource WhatsNewListItemDataTemplate}"
+ SelectionMode="None"
+ RelativePanel.Below="GeneralInfoTextBlock"
+ RelativePanel.AlignBottomWithPanel="True" RelativePanel.AlignLeftWithPanel="True" RelativePanel.AlignRightWithPanel="True">
+ <ListView.GroupStyle>
+ <GroupStyle HeaderTemplate="{StaticResource WhatsNewGroupHeaderTemplate}" />
+ </ListView.GroupStyle>
+ </ListView>
+
+ <Button Content="Ok"
+ MinWidth="100"
+ RelativePanel.AlignBottomWithPanel="True" RelativePanel.AlignLeftWithPanel="True"
+ Click="OnOkButtonClick"/>
+ </RelativePanel>
+</ContentDialog>

src/Kliva/Controls/AppInfoDialog.xaml.cs

@@ -1,12 +1,13 @@
-using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 
 namespace Kliva.Controls
 {
  public sealed partial class AppInfoDialog : ContentDialog
  {
  public AppInfoDialog()
  {
- this.InitializeComponent();
+ this.InitializeComponent(); 
  }
 
  private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
@@ -16,5 +17,10 @@ private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialo
  private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
  {
  }
+
+ private void OnOkButtonClick(object sender, RoutedEventArgs e)
+ {
+ Hide();
+ }
  }
 }

src/Kliva/ViewModels/MainViewModel.cs

@@ -153,6 +153,15 @@ private async void ViewLoaded()
  await _settingsService.SetAppVersionAsync(runTimeVersion);
  //TODO: Glenn - Check loaded version with saved version in Settings, if different show what's new dialog and overwrite settings field
  AppInfoDialog appInfo = new AppInfoDialog();
+ //TODO: Change the strings to enums or constants for the visual states
+ if (CurrentState.Name.Equals("Mobile", StringComparison.OrdinalIgnoreCase))
+ appInfo.FullSizeDesired = true;
+ else
+ {
+ appInfo.MinWidth = (double) (Window.Current.Bounds.Width * 90) / 100;
+ appInfo.MinHeight = (double)(Window.Current.Bounds.Height * 90) / 100;
+ }
+
  await appInfo.ShowAsync();
  }