Skip to content
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

Version 1.3: updated changelog & final enhancements #276

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Version 1.3: updated changelog & final enhancements #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c21057
add assets
alessandrocaseti Aug 19, 2024
611c7e0
main
alessandrocaseti Aug 19, 2024
f3cadb5
fix
alessandrocaseti Sep 19, 2024
34a4715
final commit
alessandrocaseti Oct 14, 2024
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
Binary file added ClassevivaPCTO/Assets/BannerGetStarted.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ClassevivaPCTO/Assets/BannerRelease1_3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ClassevivaPCTO/Assets/LogoFont.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ClassevivaPCTO/Assets/storescreenshot.png
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion ClassevivaPCTO/ClassevivaPCTO.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Content Include="Assets\BannerRelease1_3.png" />
<Content Include="Assets\BannerGetStarted.png" />
<Content Include="Assets\Fonts\SegoeFluentIcons.ttf" />
<None Include="ClassevivaPCTO_TemporaryKey.pfx" />
<Content Include="Assets\Icons\ic_fluent_bug_24_regular.svg" />
Expand All @@ -300,6 +302,7 @@
<Content Include="Assets\LargeTile.scale-150.png" />
<Content Include="Assets\LargeTile.scale-200.png" />
<Content Include="Assets\LargeTile.scale-400.png" />
<Content Include="Assets\LogoFont.png" />
<Content Include="Assets\mainlogo.png" />
<Content Include="Assets\SmallTile.scale-100.png" />
<Content Include="Assets\SmallTile.scale-125.png" />
Expand Down Expand Up @@ -337,7 +340,6 @@
<Content Include="Assets\StoreLogo.scale-150.png" />
<Content Include="Assets\StoreLogo.scale-200.png" />
<Content Include="Assets\StoreLogo.scale-400.png" />
<Content Include="Assets\storescreenshot.png" />
<Content Include="Assets\Wide310x150Logo.scale-100.png" />
<Content Include="Assets\Wide310x150Logo.scale-125.png" />
<Content Include="Assets\Wide310x150Logo.scale-150.png" />
Expand Down
89 changes: 59 additions & 30 deletions ClassevivaPCTO/Dialogs/FirstRunDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,65 +8,94 @@
d:DesignWidth="550"
mc:Ignorable="d"
Style="{StaticResource DefaultContentDialogStyle}"
PrimaryButtonStyle="{StaticResource DefaultButtonStyle}" >
PrimaryButtonStyle="{StaticResource DefaultButtonStyle}">

<ContentDialog.TitleTemplate>
<DataTemplate x:DataType="x:String">
<RelativePanel HorizontalAlignment="Center">

<Image x:Name="AppLogo"
Width="40"
Height="40"
Margin="210,8,0,0"
RelativePanel.AlignVerticalCenterWithPanel="True"
Source="ms-appx:///Assets/StoreLogo.png" />
<RelativePanel Width="850" HorizontalAlignment="Center">

<TextBlock x:Name="WelocomeText"
Margin="18,0,0,0"
Margin="0,-8,0,0"
VerticalAlignment="Center"
FontSize="24"
FontWeight="SemiBold"
RelativePanel.AlignVerticalCenterWith="AppLogo"
RelativePanel.RightOf="AppLogo"
Text="{x:Bind}" />

<Image Width="180"
Height="180"
Margin="7,-3,0,0"
RelativePanel.Above="Separator"
RelativePanel.RightOf="WelocomeText"
Source="/Assets/LogoFont.png" />

<Rectangle x:Name="Separator"
Width="844"
Height="1"
Margin="0,6,0,4"
Fill="#5B5B5B"
RelativePanel.AlignLeftWithPanel="True"
RelativePanel.Below="WelocomeText" />

</RelativePanel>
</DataTemplate>
</ContentDialog.TitleTemplate>

<ScrollViewer MaxWidth="800">

<ScrollViewer MaxWidth="850" Margin="0,-160,0,0">
<StackPanel>

<TextBlock Margin="0,25"
<Image Width="870"
Height="350"
Margin="-14,-55,0,-90"
Source="/Assets/BannerGetStarted.png"
Stretch="Uniform" />

<TextBlock Margin="0,20,0,16"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Text="{CustomResource FirstRunDialogBody}"
TextWrapping="WrapWholeWords" />

<HyperlinkButton NavigateUri="https://github.com/Gabboxl/ClassevivaPCTO/graphs/contributors">
<StackPanel Orientation="Horizontal" Spacing="10">
<Rectangle Width="844"
Height="1"
Margin="-6,0,0,8"
Fill="#5B5B5B" />

<StackPanel Margin="2,4,0,0"
Orientation="Horizontal"
Spacing="10">

<TextBlock Margin="0,6,0,0"
FontWeight="Medium"
Text="{CustomResource FirstRunDialogMoreInfo}" />

<HyperlinkButton NavigateUri="https://github.com/Gabboxl/ClassevivaPCTO/blob/main/LICENSE">
<StackPanel Orientation="Horizontal" Spacing="10">

<Grid Width="18" Height="18">
<Path Data="{CustomResource ShieldIcon}" Style="{StaticResource HyperlinkIconStyle}" />
</Grid>

<TextBlock Text="{CustomResource FirstRunDialogLicensesHyperlink}" />

<Grid Width="18" Height="18">
<Path Data="{CustomResource GithubIcon}" Style="{StaticResource HyperlinkIconStyle}" />
</Grid>
</StackPanel>
</HyperlinkButton>

<TextBlock Text="{CustomResource FirstRunDialogContributorsHyperlink}" />
<HyperlinkButton NavigateUri="https://github.com/Gabboxl/ClassevivaPCTO">
<StackPanel Orientation="Horizontal" Spacing="10">

</StackPanel>
</HyperlinkButton>
<Grid Width="18" Height="18">
<Path Data="{CustomResource GitHubIcon}" Style="{StaticResource HyperlinkIconStyle}" />
</Grid>

<HyperlinkButton NavigateUri="https://github.com/Gabboxl/ClassevivaPCTO/blob/main/LICENSE">
<StackPanel Orientation="Horizontal" Spacing="10">
<TextBlock Text="GitHub" />

<Grid Width="18" Height="18">
<Path Data="{CustomResource GithubIcon}" Style="{StaticResource HyperlinkIconStyle}" />
</Grid>
</StackPanel>
</HyperlinkButton>

<TextBlock Text="{CustomResource FirstRunDialogLicensesHyperlink}" />
</StackPanel>

</StackPanel>
</HyperlinkButton>
</StackPanel>
</ScrollViewer>
</ContentDialog>
164 changes: 76 additions & 88 deletions ClassevivaPCTO/Dialogs/WhatsNewDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,23 @@
d:DesignWidth="750"
mc:Ignorable="d"
Style="{StaticResource DefaultContentDialogStyle}"
PrimaryButtonStyle="{StaticResource DefaultButtonStyle}" >
PrimaryButtonStyle="{StaticResource DefaultButtonStyle}">

<ContentDialog.TitleTemplate>
<DataTemplate x:DataType="x:String">
<RelativePanel Width="720">
<RelativePanel Width="850">

<TextBlock x:Name="AppName"
Margin="0,-4,0,0"
Margin="0,-8,0,0"
VerticalAlignment="Center"
FontSize="26"
FontWeight="SemiBold"
RelativePanel.AlignLeftWithPanel="True"
Text="{x:Bind}" />

<TextBlock Margin="0,2,8,0"
VerticalAlignment="Center"
FontSize="16"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
IsTextSelectionEnabled="True"
RelativePanel.AlignRightWithPanel="True"
Text="{CustomResource WhatsNewDialogRelease}" />

<Rectangle Width="712"
<Rectangle Width="844"
Height="1"
Margin="0,4,0,4"
Margin="0,6,0,4"
Fill="#5B5B5B"
RelativePanel.AlignLeftWithPanel="True"
RelativePanel.Below="AppName" />
Expand All @@ -41,14 +33,14 @@
</DataTemplate>
</ContentDialog.TitleTemplate>

<ScrollViewer Width="720" Height="350">
<ScrollViewer Width="850" Height="370">

<StackPanel>

<Image Width="770"
<Image Width="870"
Height="350"
Margin="-24,-50,0,-70"
Source="/Assets/storescreenshot.png"
Margin="-14,-60,0,-72"
Source="/Assets/BannerRelease1_3.png"
Stretch="Uniform" />

<!-- In evidenza -->
Expand All @@ -59,50 +51,48 @@
TextWrapping="WrapWholeWords" />

<TextBlock x:Name="Highlights"
Margin="0,12,15,0"
Margin="0,14,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />

<RelativePanel Visibility="Collapsed">

<!-- Generali -->
<TextBlock Margin="0,0,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource SettingsGeneralHeader}"
TextWrapping="WrapWholeWords" />
<!-- Generali -->
<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource SettingsGeneralHeader}"
TextWrapping="WrapWholeWords" />

<TextBlock x:Name="General"
Margin="0,15,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />
<TextBlock x:Name="General"
Margin="0,14,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />

<!-- Dashboard -->
<TextBlock Margin="0,0,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="Dashboard"
TextWrapping="WrapWholeWords" />
<!-- Dashboard -->
<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="Dashboard"
TextWrapping="WrapWholeWords" />

<TextBlock x:Name="Dashboard"
Margin="0,15,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />
<TextBlock x:Name="Dashboard"
Margin="0,14,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />

<!-- Agenda -->
<TextBlock Margin="0,20,0,0"
<!-- Agenda -->
<!--<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource AgendaTitle}"
Expand All @@ -112,29 +102,29 @@
Margin="0,15,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />
TextWrapping="WrapWholeWords" />-->

<!-- Valutazioni -->
<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource GradesTitle}"
TextWrapping="WrapWholeWords" />
<!-- Valutazioni -->
<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource GradesTitle}"
TextWrapping="WrapWholeWords" />

<TextBlock x:Name="Grades"
Margin="0,15,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />
<TextBlock x:Name="Grades"
Margin="0,14,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />

<!-- Assenze -->
<TextBlock Margin="0,20,0,0"
<!-- Assenze -->
<!--<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource AbsencesTitle}"
Expand All @@ -144,31 +134,29 @@
Margin="0,15,15,20"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />
TextWrapping="WrapWholeWords" />-->

<!-- Bacheca -->
<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource NoticeBoardTitle}"
TextWrapping="WrapWholeWords" />

<TextBlock x:Name="NoticeBoard"
Margin="0,15,15,20"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />
<!-- Bacheca -->
<TextBlock Margin="0,20,0,0"
FontSize="24"
FontWeight="SemiBold"
Text="{CustomResource NoticeBoardTitle}"
TextWrapping="WrapWholeWords" />

</RelativePanel>
<TextBlock x:Name="NoticeBoard"
Margin="0,14,15,0"
FontSize="15"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
LineHeight="26"
TextWrapping="WrapWholeWords" />

<HyperlinkButton x:Name="WhatsNewHyperlink"
Margin="0,12,0,0"
Margin="0,16,0,0"
NavigateUri="https://github.com/Gabboxl/ClassevivaPCTO/releases/latest">

<StackPanel Orientation="Horizontal" Spacing="10">
Expand Down
4 changes: 2 additions & 2 deletions ClassevivaPCTO/Dialogs/WhatsNewDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public WhatsNewDialog()
Highlights.Text = "ChangelogHighlighsSection".GetLocalizedStr();
General.Text = "ChangelogGeneralSection".GetLocalizedStr();
Dashboard.Text = "ChangelogDashboardSection".GetLocalizedStr();
Agenda.Text = "ChangelogAgendaSection".GetLocalizedStr();
// Agenda.Text = "ChangelogAgendaSection".GetLocalizedStr();
Grades.Text = "ChangelogGradesSection".GetLocalizedStr();
Absences.Text = "ChangelogAbsencesSection".GetLocalizedStr();
// Absences.Text = "ChangelogAbsencesSection".GetLocalizedStr();
NoticeBoard.Text = "ChangelogNoticeBoardSection".GetLocalizedStr();
}
}
Expand Down
Loading