Skip to content

Commit

Permalink
third set of improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@alessandrocaseti
alessandrocaseti committed Aug 25, 2023
1 parent 08782df commit 2e59dcd
Show file tree
Hide file tree
Showing 14 changed files with 149 additions and 74 deletions.
2 changes: 1 addition & 1 deletion ClassevivaPCTO/Controls/AbsencesListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<!-- ="{ThemeResource SystemControlBackgroundBaseMediumBrush}" -->
</Ellipse>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center"
Text="{x:Bind ShortEventName}" FontSize="16" Foreground="#FFFFFF" />
Text="{x:Bind ShortEventName}" FontSize="16" Foreground="#FFFFFF" FontWeight="Medium"/>

</Grid>

Expand Down
10 changes: 5 additions & 5 deletions ClassevivaPCTO/Controls/AgendaListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,24 @@
MaxWidth="500"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Text="{x:Bind EventType}"
FontStyle="Italic"
FontWeight="Medium"
Style="{ThemeResource BaseTextBlockStyle}"
Margin="12,10,0,0" />
Margin="10,10,0,0" />


<TextBlock RelativePanel.RightOf="titoloEvento" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="dataStart"

Text="{x:Bind CurrentObject.evtDatetimeBegin, Converter={StaticResource DateTimeToHourConverter}}"
FontStyle="Italic" FontWeight="Medium"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="10,12,0,0" />
<!-- trattino -->
<TextBlock RelativePanel.RightOf="dataStart" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="placeholderData"
Text="-"
FontStyle="Italic" FontWeight="Medium"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="6,12,6,0" />
Expand All @@ -69,7 +69,7 @@
<TextBlock RelativePanel.RightOf="placeholderData" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="dataEnd"
Text="{x:Bind CurrentObject.evtDatetimeEnd, Converter={StaticResource DateTimeToHourConverter}}"
FontStyle="Italic" FontWeight="Medium"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="0,12,0,0" />
Expand Down
101 changes: 57 additions & 44 deletions ClassevivaPCTO/Controls/AgendaMultipleDaysListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,55 +25,61 @@
<!-- icon calendar -->
<FontIcon x:Name="IconCalendar" FontFamily="{StaticResource FluentIcons}" Glyph="&#xE787;"
RelativePanel.AlignVerticalCenterWithPanel="True"
Margin="0,0,8,0" />

Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="4,0,8,0" />

<TextBlock x:Name="titoloEvento" TextWrapping="Wrap"
RelativePanel.RightOf="IconCalendar"
MaxWidth="500"
Text="{x:Bind Title}"
IsTextSelectionEnabled="True"
Text="{x:Bind Title}"
Style="{ThemeResource BaseTextBlockStyle}"
Margin="6,6,0,0" />
Margin="6,12,0,0" />


<TextBlock RelativePanel.RightOf="titoloEvento" x:Name="tipoEvento" TextWrapping="Wrap"
<TextBlock RelativePanel.RightOf="dataEnd" x:Name="tipoEvento" TextWrapping="Wrap"
RelativePanel.AlignVerticalCenterWith="titoloEvento"
MaxWidth="500"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Text="{x:Bind EventType}"
FontWeight="Medium"
Style="{ThemeResource BaseTextBlockStyle}"
Margin="6,6,0,0" />
Margin="10,10,0,0" />

<TextBlock RelativePanel.RightOf="titoloEvento" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="dataStart"

<TextBlock RelativePanel.Below="titoloEvento" x:Name="dataStart"
RelativePanel.RightOf="IconCalendar"
Text="{x:Bind CurrentObject.evtDatetimeBegin, Converter={StaticResource DateTimeToHourConverter}}"
FontStyle="Italic"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
IsTextSelectionEnabled="True"
Margin="6,0,0,0" />

<TextBlock RelativePanel.RightOf="dataStart" RelativePanel.Below="titoloEvento"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="12,12,0,0" />
<!-- trattino -->
<TextBlock RelativePanel.RightOf="dataStart" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="placeholderData"
Text="-"
FontStyle="Italic"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
Margin="6,0,6,0" />
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="6,12,6,0" />


<TextBlock RelativePanel.RightOf="placeholderData" RelativePanel.Below="titoloEvento" x:Name="dataEnd"
<TextBlock RelativePanel.RightOf="placeholderData" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="dataEnd"
Text="{x:Bind CurrentObject.evtDatetimeEnd, Converter={StaticResource DateTimeToHourConverter}}"
FontStyle="Italic"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
IsTextSelectionEnabled="True"
Margin="0,0,0,0" />
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="0,12,0,0" />

<TextBlock RelativePanel.Below="dataStart" x:Name="descriptionEvent"
<TextBlock RelativePanel.Below="titoloEvento" x:Name="descriptionEvent"
RelativePanel.RightOf="IconCalendar"
TextWrapping="Wrap"
Text="{x:Bind CurrentObject.notes}"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
FontWeight="SemiBold"
IsTextSelectionEnabled="True"
Margin="6,6,0,6" />
Margin="6,4,0,12" />


</RelativePanel>
Expand All @@ -88,63 +94,70 @@
<!-- icon calendar -->
<FontIcon x:Name="IconCalendar" FontFamily="{StaticResource FluentIcons}" Glyph="&#xE787;"
RelativePanel.AlignVerticalCenterWithPanel="True"
Margin="0,0,8,0" />
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="4,0,8,0" />


<TextBlock x:Name="titoloEvento" TextWrapping="Wrap"
RelativePanel.RightOf="IconCalendar"
MaxWidth="500"
Text="{x:Bind Title}"
IsTextSelectionEnabled="True"
Text="{x:Bind Title}"
Style="{ThemeResource BaseTextBlockStyle}"
Margin="6,6,0,0" />
Margin="6,12,0,0" />


<TextBlock RelativePanel.RightOf="titoloEvento" x:Name="tipoEvento" TextWrapping="Wrap"
<TextBlock RelativePanel.RightOf="dataEnd" x:Name="tipoEvento" TextWrapping="Wrap"
RelativePanel.AlignVerticalCenterWith="titoloEvento"
MaxWidth="500"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Text="{x:Bind EventType}"
FontWeight="Medium"
Style="{ThemeResource BaseTextBlockStyle}"
Margin="6,6,0,0" />
Margin="10,10,0,0" />

<!-- date of the lesson -->
<TextBlock RelativePanel.RightOf="tipoEvento" x:Name="date"
Text="{x:Bind CurrentObject.evtDatetimeBegin, Converter={StaticResource DateTimeToNormalDateConverter}}"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Foreground="Transparent"
IsTextSelectionEnabled="True"
Margin="12,6,0,0" />

<TextBlock RelativePanel.RightOf="titoloEvento" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="dataStart"

<TextBlock RelativePanel.Below="titoloEvento" x:Name="dataStart"
RelativePanel.RightOf="IconCalendar"
Text="{x:Bind CurrentObject.evtDatetimeBegin, Converter={StaticResource DateTimeToHourConverter}}"
FontStyle="Italic"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
IsTextSelectionEnabled="True"
Margin="6,0,0,0" />

<TextBlock RelativePanel.RightOf="dataStart" RelativePanel.Below="titoloEvento"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="12,12,0,0" />
<!-- trattino -->
<TextBlock RelativePanel.RightOf="dataStart" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="placeholderData"
Text="-"
FontStyle="Italic"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
Margin="6,0,6,0" />

Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="6,12,6,0" />

<TextBlock RelativePanel.RightOf="placeholderData" RelativePanel.Below="titoloEvento" x:Name="dataEnd"
<TextBlock RelativePanel.RightOf="placeholderData" RelativePanel.AlignVerticalCenterWith="titoloEvento"
x:Name="dataEnd"
Text="{x:Bind CurrentObject.evtDatetimeEnd, Converter={StaticResource DateTimeToHourConverter}}"
FontStyle="Italic"
FontWeight="Medium"
Style="{ThemeResource BodyTextBlockStyle}"
IsTextSelectionEnabled="True"
Margin="0,0,0,0" />
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="0,12,0,0" />

<TextBlock RelativePanel.Below="dataStart" x:Name="descriptionEvent"
<TextBlock RelativePanel.Below="titoloEvento" x:Name="descriptionEvent"
RelativePanel.RightOf="IconCalendar"
TextWrapping="Wrap"
Text="{x:Bind CurrentObject.notes}"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
FontWeight="SemiBold"
IsTextSelectionEnabled="True"
Margin="6,6,0,6" />
Margin="6,4,0,12" />


</RelativePanel>
Expand Down
2 changes: 1 addition & 1 deletion ClassevivaPCTO/Controls/GradesListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!-- ="{ThemeResource SystemControlBackgroundBaseMediumBrush}" -->
</Ellipse>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center"
Text="{x:Bind CurrentObject.displayValue}" FontSize="16" Foreground="#FFFFFF" />
Text="{x:Bind CurrentObject.displayValue}" FontSize="16" Foreground="#FFFFFF" FontWeight="Medium"/>

</Grid>

Expand Down
17 changes: 11 additions & 6 deletions ClassevivaPCTO/Controls/LessonsListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,44 +92,49 @@
<TextBlock x:Name="textMateria" TextWrapping="WrapWholeWords"
MaxWidth="500"
Text="{x:Bind CurrentObject.subjectDesc}"
Style="{ThemeResource BaseTextBlockStyle}"
IsTextSelectionEnabled="True"
Style="{ThemeResource BaseTextBlockStyle}"
Margin="12,6,0,0" />

<TextBlock x:Name="durationHours" TextWrapping="NoWrap" RelativePanel.RightOf="textMateria"
MaxWidth="500"
Style="{ThemeResource BaseTextBlockStyle}"
Margin="12,6,0,0">
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
Margin="10,6,0,0">
<Run Text="(" /><Run Text="{x:Bind Durata}" /><Run Text=")" />
</TextBlock>

<!-- date of the lesson -->
<TextBlock RelativePanel.RightOf="durationHours" x:Name="date"
Text="{x:Bind CurrentObject.evtDate, Converter={StaticResource DateTimeToNormalDateConverter}}"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
IsTextSelectionEnabled="True"
Margin="12,6,0,0" />

<TextBlock RelativePanel.Below="textMateria" x:Name="nomeAutore"
Text="{x:Bind CurrentObject.authorName}"
FontStyle="Italic"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
FontStyle="Italic" FontWeight="Medium"
IsTextSelectionEnabled="True"
Style="{ThemeResource BodyTextBlockStyle}"
Margin="12,0,0,0" />

<TextBlock RelativePanel.Below="nomeAutore" x:Name="tipoLezione"
Text="{x:Bind CurrentObject.lessonType}"
Style="{ThemeResource BodyTextBlockStyle}"
FontStyle="Italic"
Foreground="{x:Bind ColorBrush}"
IsTextSelectionEnabled="True"
Margin="12,0,0,0" />

<TextBlock RelativePanel.Below="nomeAutore" RelativePanel.RightOf="tipoLezione"
TextWrapping="WrapWholeWords"
Text="{x:Bind CurrentObject.lessonArg}"
Style="{ThemeResource BodyTextBlockStyle}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
FontWeight="SemiBold"
IsTextSelectionEnabled="True"
Margin="12,0,0,6" />

Expand Down
3 changes: 2 additions & 1 deletion ClassevivaPCTO/Controls/NoticesListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:local="using:ClassevivaPCTO.Controls"
xmlns:adapters="using:ClassevivaPCTO.Adapters"
xmlns:converters="using:ClassevivaPCTO.Converters"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Expand Down Expand Up @@ -119,7 +120,7 @@
Visibility="{x:Bind IsDeleted, Converter={StaticResource BetterBoolToVisibilityConverter}, ConverterParameter=False}"
Click="ReadButton_Click"
Style="{ThemeResource TextButtonStyle}"
Margin="0,0,8,0">
Margin="0,0,8,0" toolkit:FrameworkElementExtensions.Cursor="Hand">
<Button.Content>
<StackPanel Orientation="Horizontal">
<FontIcon FontFamily="{StaticResource FluentIcons}" Glyph="&#xE890;" />
Expand Down
4 changes: 2 additions & 2 deletions ClassevivaPCTO/Helpers/Palettes/IPalette.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public enum PaletteType
PALETTE_JAP,
[ClassMapping(typeof(PaletteNat))]
PALETTE_NAT,
[ClassMapping(typeof(PaletteNat))]
[ClassMapping(typeof(Palette4))]
PALETTE_4,
[ClassMapping(typeof(PaletteNat))]
[ClassMapping(typeof(Palette5))]
PALETTE_5,

}
Expand Down
10 changes: 5 additions & 5 deletions ClassevivaPCTO/Helpers/Palettes/Palettes.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class PaletteJap : IPalette

public class PaletteNat : IPalette
{
public Color ColorRed => ColorHelper.ToColor("#9A4D31");
public Color ColorRed => ColorHelper.ToColor("#A25E50");
public Color ColorOrange => ColorHelper.ToColor("#FC9553");
public Color ColorGreen => ColorHelper.ToColor("#78C141");
public Color ColorBlue => ColorHelper.ToColor("#42AACD");
Expand All @@ -37,10 +37,10 @@ public class PaletteNat : IPalette

public class Palette4 : IPalette
{
public Color ColorRed => ColorHelper.ToColor("#9A4D31");
public Color ColorOrange => ColorHelper.ToColor("#FC9553");
public Color ColorGreen => ColorHelper.ToColor("#78C141");
public Color ColorBlue => ColorHelper.ToColor("#42AACD");
public Color ColorRed => ColorHelper.ToColor("#FF0000");
public Color ColorOrange => ColorHelper.ToColor("#FF7D00");
public Color ColorGreen => ColorHelper.ToColor("#00FF00");
public Color ColorBlue => ColorHelper.ToColor("#0000FF");
public Color ColorYellow => Colors.Goldenrod;

}
Expand Down
9 changes: 9 additions & 0 deletions ClassevivaPCTO/Strings/it-it/Resources.resw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,4 +453,13 @@ Gli account studente hanno l'username che inizia con le lettere S, G o X.</value
<data name="SettingsChangeProfilePicButton.Text" xml:space="preserve">
<value>Cambia foto</value>
</data>
<data name="Settings_Language_De_DE.Content" xml:space="preserve">
<value>Tedesco</value>
</data>
<data name="Settings_Language_Es_ES.Content" xml:space="preserve">
<value>Spagnolo</value>
</data>
<data name="Settings_Language_Fr_FR.Content" xml:space="preserve">
<value>Francese</value>
</data>
</root>
Loading

0 comments on commit 2e59dcd

Please sign in to comment.