Skip to content

MainPackage UI Refactoring #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Huios merged 5 commits into from
Oct 1, 2019
Merged

MainPackage UI Refactoring #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2f9bc0
Updating Mod Packages to use Optional Packages Schema
Aug 13, 2019
0efdb23
Fixed Update Settings + OS + Schema mismatch Bugs for HoursBetweenUpd…
Sep 25, 2019
eb57362
Comment spelling fix
Sep 25, 2019
5de2d84
Refactoring Main Package UI
Oct 1, 2019
bcd3b68
Merge branch 'master' into tanaka-modpackageschema
Huios Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AppInstallerFileBuilder/AppInstallerFileBuilder/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="AppInstallerFileBuilder" Publisher="CN=MSIX-Toolkit-Tempkey" Version="1.2019.812.0" />
<Identity Name="AppInstallerFileBuilder" Publisher="CN=MSIX-Toolkit-Tempkey" Version="1.2019.1001.0" />
<mp:PhoneIdentity PhoneProductId="4a19f631-5573-4e7d-9544-322a5adf9868" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppInstaller File Builder (Preview)</DisplayName>
Expand Down
132 changes: 72 additions & 60 deletions AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
mc:Ignorable="d">

<RelativePanel>
<ScrollViewer VerticalScrollMode="Enabled" VerticalScrollBarVisibility="Visible">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="{StaticResource PageMargin}">
<ScrollViewer VerticalScrollMode="Enabled" VerticalScrollBarVisibility="Visible" x:Name="Main_ScrollViewer">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="{StaticResource PageMargin}" MinHeight="917" MinWidth="637">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
Expand Down Expand Up @@ -51,7 +51,7 @@
Width="453"
Margin="0,0,15,0"
/>
<Button x:Name="PackageInfoButton" Content="Get Package Info">
<Button x:Name="PackageInfoButton" Content="Get Package Info" Margin="12,0,0,0">

</Button>
</StackPanel>
Expand All @@ -61,7 +61,7 @@
<StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
<TextBlock
ToolTipService.ToolTip="e.g. MyCompany.MySuite.MyApp"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center">
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185">
<Run Text="Name" />
<Run Text="*" Foreground="Red" />
</TextBlock>
Expand All @@ -73,14 +73,14 @@
PlaceholderText="Package Name"
HorizontalAlignment="Left"
Width="400"
Margin="141,0,0,0"
Margin="10,0,0,0"
/>
</StackPanel >

<StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
<TextBlock
ToolTipService.ToolTip="e.g. 1.0.0.0"
Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" FontSize="15" VerticalAlignment="Center" Windows10FallCreatorsUpdate:HorizontalTextAlignment="Right">
Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" FontSize="15" VerticalAlignment="Center" Windows10FallCreatorsUpdate:HorizontalTextAlignment="Left" Width="185">
<Run Text="Version" />
<Run Text="*" Foreground="Red" />
</TextBlock>
Expand All @@ -93,14 +93,14 @@
ToolTipService.ToolTip="e.g. 1.0.0.0"
HorizontalAlignment="Left"
Width="400"
Margin="132,0,0,0"
Margin="10,0,0,0"
/>
</StackPanel>

<StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
<TextBlock
ToolTipService.ToolTip="e.g. CN=janedoe"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center">
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185">
<Run Text="Publisher" />
<Run Text="*" Foreground="Red" />
</TextBlock>
Expand All @@ -112,15 +112,15 @@
PlaceholderText="Publisher"
HorizontalAlignment="Left"
Width="400"
Margin="121,0,0,0"
Margin="10,0,0,0"
/>
</StackPanel>

<StackPanel x:Name="Resource_Id_Stack_Panel" Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
<TextBlock
x:Uid="Resource_Id"
ToolTipService.ToolTip="e.g. English"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center">
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185">
<Run Text="Resource Id"/>
</TextBlock>
<TextBox
Expand All @@ -131,13 +131,13 @@
PlaceholderText="Resource Id"
HorizontalAlignment="Left"
Width="400"
Margin="116,0,0,0"
Margin="10,0,0,0"
/>
</StackPanel>

<StackPanel Margin="{StaticResource SettingsSubheaderMargin}" x:Name="Processor_Type_Stack_Panel" Orientation="Horizontal">
<TextBlock
Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" VerticalAlignment="Center" FontSize="15">
Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" VerticalAlignment="Center" FontSize="15" Width="185">
<Run Text="Processor Architecture Type" />
</TextBlock>

Expand All @@ -149,14 +149,14 @@
PlaceholderText="Processor Architecture"
HorizontalAlignment="Left"
Width="400"
Margin="8,0,0,0"
Margin="10,0,0,0"
/>
</StackPanel>

<StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
<TextBlock
ToolTipService.ToolTip="e.g. C:\Users\JaneDoe\Desktop\MyApp.msix"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185"
>
<Run Text="File Path" />
<Run Text="*" Foreground="Red"/>
Expand All @@ -169,102 +169,114 @@
PlaceholderText="Enter the package URI"
ToolTipService.ToolTip="e.g. C:\Users\JaneDoe\Desktop\MyApp.msix"
HorizontalAlignment="Left"
Width="518"
Margin="8,0,0,0"
Width="400"
Margin="10,0,0,0"
/>
</StackPanel>
</StackPanel>

<StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
<TextBlock
x:Uid="Check_For_Updates"
Style="{StaticResource SubtitleTextBlockStyle}" Padding="1,0,0,0" FontSize="15"
Margin="5" VerticalAlignment="Center"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
VerticalAlignment="Center"
Margin="5"
Width="185"
/>
<ToggleSwitch
x:Uid="Check_For_Updates_Switch"
x:Name="Check_For_Updates_Switch"
IsOn="{Binding IsCheckUpdates}"
Toggled="ToggleSwitch_Toggled"
Margin="10,0,0,0"
/>
</StackPanel>

<StackPanel Margin="{StaticResource SettingsSubheaderMargin}" x:Name="Update_Settings_Stack_Panel">
<StackPanel x:Name="Compatibility_Stack_Panel" Orientation="Horizontal">
<StackPanel x:Name="Update_Settings_Stack_Panel">
<StackPanel x:Name="Compatibility_Stack_Panel" Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
<TextBlock
x:Uid="compat_text_block"
Text="Min OS Version:"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Margin="5" VerticalAlignment="Center"
/>
<ComboBox x:Name="CompatComboBox" x:Uid="CompatComboBox" PlaceholderText="Choose the min Win10 OS version" ItemsSource="{x:Bind Schemas}" SelectionChanged="CompatComboBox_SelectionChanged"/>
Width="185"/>
<ComboBox x:Name="CompatComboBox" x:Uid="CompatComboBox" PlaceholderText="Choose the min Win10 OS version" ItemsSource="{x:Bind Path=Schemas}" SelectionChanged="CompatComboBox_SelectionChanged" Margin="10,0,0,0"/>
</StackPanel>

<StackPanel Orientation="Horizontal" x:Name="One_Update_Settings_Stack_Panel" x:Uid="One_Update_Settings_Stack_Panel" Visibility="Collapsed">

<StackPanel Orientation="Vertical" x:Name="One_Update_Settings_Stack_Panel" x:Uid="One_Update_Settings_Stack_Panel" Visibility="Collapsed">
</StackPanel>

<StackPanel Orientation="Horizontal" x:Name="Two_Update_Settings_Stack_Panel" x:Uid="Two_Update_Settings_Stack_Panel" Visibility="Collapsed">
<TextBlock
x:Uid="Update_Frequency_Text_Block"
Text="Hours between update checks"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Margin="5" VerticalAlignment="Center"
<StackPanel Orientation="Vertical" x:Name="Two_Update_Settings_Stack_Panel" x:Uid="Two_Update_Settings_Stack_Panel" Visibility="Collapsed">
<StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
<TextBlock x:Uid="Update_Frequency_Text_Block"
Text="Hours between update checks"
Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Width="185" VerticalAlignment="Center"
Margin="5"
/>
<TextBox
x:Uid="Hours_Between_Updates_Text_Box"
x:Name="Hours_Between_Updates_Text_Box"
PlaceholderText="12"
Width="70"
HorizontalAlignment="Left"
FontSize="15" Margin="5" VerticalAlignment="Center"
FontSize="15" Margin="10,0,0,0" VerticalAlignment="Center"
/>

<TextBlock Text="Auto background update" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Margin="5" VerticalAlignment="Center" />
<ToggleSwitch
Margin="21,0,0,0"
</StackPanel>

<StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
<TextBlock Text="Auto background update checks" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Width="185" Margin="5"
VerticalAlignment="Center" />
<ToggleSwitch
Margin="10,0,0,0"
x:Uid="Auto_Update_Switch"
x:Name="Auto_Update_Switch"
IsOn="{Binding IsAutoUpdate}"
Toggled="Auto_Update_Switch_Toggled"
HorizontalAlignment="Right"
/>
</StackPanel>
</StackPanel>

<StackPanel Orientation="Horizontal" x:Name="Three_Update_Settings_Stack_Panel" x:Uid="Three_Update_Settings_Stack_Panel" Visibility="Collapsed">
<TextBlock Text="Force update" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Margin="5" VerticalAlignment="Center" />
<ToggleSwitch
Margin="21,0,0,0"
x:Uid="Force_Update_Switch"
x:Name="Force_Update_Switch"
IsOn="{Binding IsForcedUpdate}"
Toggled="Force_Update_Switch_Toggled"
/>

<TextBlock Text="Show prompt" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Margin="5" VerticalAlignment="Center"/>
<ToggleSwitch
Margin="21,0,0,0"
<StackPanel Orientation="Vertical" x:Name="Three_Update_Settings_Stack_Panel" x:Uid="Three_Update_Settings_Stack_Panel" Visibility="Collapsed">
<StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
<TextBlock Text="Show update prompt" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Width="185" Margin="5" VerticalAlignment="Center"/>
<ToggleSwitch
Margin="10,0,0,0"
x:Uid="Show_Prompt_Switch"
x:Name="Show_Prompt_Switch"
IsOn="{Binding IsShowPrompt}"
Toggled="Show_Prompt_Switch_Toggled"
HorizontalAlignment="Right"
/>
<TextBlock Text="Blocking update" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Margin="31,5,5,5" VerticalAlignment="Center"/>
<ToggleSwitch
Margin="2,0,0,0"
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
<TextBlock Text="Update blocks activation" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Width="185" Margin="5" VerticalAlignment="Center"/>
<ToggleSwitch
Margin="10,0,0,0"
x:Uid="Block_Update_Switch"
x:Name="Block_Update_Switch"
IsOn="{Binding IsBlockingUpdate}"
Toggled="Block_Update_Switch_Toggled"
HorizontalAlignment="Right"
/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
<TextBlock Text="Force update to version" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
Width="185" Margin="5" VerticalAlignment="Center" />
<ToggleSwitch
Margin="10,0,0,0"
x:Uid="Force_Update_Switch"
x:Name="Force_Update_Switch"
IsOn="{Binding IsForcedUpdate}"
Toggled="Force_Update_Switch_Toggled"
HorizontalAlignment="Right"
/>
</StackPanel>
</StackPanel>

</StackPanel>


</StackPanel>
</Grid>
</ScrollViewer>
Expand Down
8 changes: 8 additions & 0 deletions AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public sealed partial class MainPackageView : Page
private StackPanel _1809updateSettingsStackPanel;

private int _hoursBetweenUpdates;
private ScrollViewer _scrollViewer;

/***************************************************************************
*
Expand All @@ -79,6 +80,7 @@ public MainPackageView()
_uriPathTextBox = (TextBox)this.FindName("Uri_Path_Text_Box");
_processorTypeStackPanel = (StackPanel)this.FindName("Processor_Type_Stack_Panel");
_resourceIdStackPanel = (StackPanel)this.FindName("Resource_Id_Stack_Panel");
_scrollViewer = (ScrollViewer)this.FindName("Main_ScrollViewer");

PackageInfoButton.Click += new RoutedEventHandler(PackageInfoButton_Click);

Expand Down Expand Up @@ -312,6 +314,7 @@ private void CompatComboBox_SelectionChanged(object sender, SelectionChangedEven
_1803updateSettingsStackPanel.Visibility = Visibility.Visible;
_1709updateSettingsStackPanel.Visibility = Visibility.Visible;
App.AppInstallerFileSchemaNamespace = "http://schemas.microsoft.com/appx/appinstaller/2018";
_scrollViewer.ChangeView(0.0f, _scrollViewer.ScrollableHeight, 1.0f);
break;
case 1: //1803 and above
Debug.WriteLine("1");
Expand All @@ -321,6 +324,7 @@ private void CompatComboBox_SelectionChanged(object sender, SelectionChangedEven
_showPromptSwitch.IsOn = false;
_blockUpdateSwitch.IsOn = false;
App.AppInstallerFileSchemaNamespace = "http://schemas.microsoft.com/appx/appinstaller/2017/2";
_scrollViewer.ChangeView(0.0f, _scrollViewer.ScrollableHeight/2.5, 1.0f);
break;
case 2: //1709 and above
Debug.WriteLine("2");
Expand Down Expand Up @@ -369,5 +373,9 @@ private void Auto_Update_Switch_Toggled(object sender, RoutedEventArgs e)

}

private void TextBlock_SelectionChanged(object sender, RoutedEventArgs e)
{

}
}
}