Skip to content

Commit

Permalink
Add switch to change font at runtime
Browse files Browse the repository at this point in the history 
- Add Roboto as default font
- Add Open Dyslexic as extra font
- Edit version string on main men
- Edit LICENCE and About screen
  • Loading branch information
@VFansss
VFansss committed Apr 10, 2020
1 parent 36c2c54 commit 4b38256
Show file tree
Hide file tree
Showing 10 changed files with 263 additions and 65 deletions.
123 changes: 120 additions & 3 deletions LICENSE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

---

This software make use of Avalonia UI, granted under MIT licence:
This software makes use of Avalonia UI, granted under MIT licence:

Avalonia UI

Expand All @@ -28,7 +28,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

---

This software make use of MessageBox.Avalonia, granted under MIT licence:
This software makes use of MessageBox.Avalonia, granted under MIT licence:

MessageBox.Avalonia

Expand Down Expand Up @@ -56,7 +56,7 @@ SOFTWARE.

---

This software make use of dotnet-bundle, granted under MIT licence:
This software makes use of dotnet-bundle, granted under MIT licence:

dotnet-bundle

Expand All @@ -81,3 +81,120 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

---

This software makes use of Roboto font, granted under Apache License 2.0:

Roboto font

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

---

This software makes use of Open Dyslexic font, granted under SIL Open Font License

Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|[email protected]),
with Reserved Font Name OpenDyslexic.
Copyright (c) 12/2012 - 2019
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
27 changes: 27 additions & 0 deletions comquiz/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,37 @@
</Setter>
</Style>

<!-- FONT binding-->

<Style Selector="Button">

<Setter Property="FontFamily" Value="{DynamicResource UIFont}"/>

</Style>

<Style Selector="TextBlock">

<Setter Property="FontFamily" Value="{DynamicResource UIFont}"/>

</Style>

<Style Selector="TextBox">

<Setter Property="FontFamily" Value="{DynamicResource UIFont}"/>

</Style>

</Application.Styles>

<Application.Resources>

<!-- FONTS -->

<FontFamily x:Key="UIFont">avares://comquiz/Assets#Roboto</FontFamily>

<FontFamily x:Key="Font_OpenDyslexic">avares://comquiz/Assets#OpenDyslexic</FontFamily>
<FontFamily x:Key="Font_Roboto">avares://comquiz/Assets#Roboto</FontFamily>

<!-- THEMING -->

<Color x:Key="ThemeAccentColor">#CC38A5FF</Color>
Expand Down
Binary file added comquiz/Assets/OpenDyslexic-Regular.otf
View file
Binary file not shown.
Binary file added comquiz/Assets/Roboto-Regular.ttf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion comquiz/ViewModels/MainMenuViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MainMenuViewModel : ViewModelBase
{
readonly public MainWindowViewModel MainDatacontext;

public string _version = "v200330";
public string _version = "v200410";
public string Version
{
get => _version;
Expand Down
115 changes: 64 additions & 51 deletions comquiz/Views/AboutScreenView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,65 +14,78 @@
</Style>

</UserControl.Styles>

<DockPanel Margin="50" VerticalAlignment="Center" HorizontalAlignment="Center">

<DockPanel.Styles>

<Style Selector="Button">
<Setter Property="Margin" Value="0 10"/>
<Setter Property="DockPanel.Dock" Value="Top"/>
</Style>

<Style Selector="DockPanel > TextBlock">
<Setter Property="Margin" Value="0 10"/>
<Setter Property="Foreground" Value="{DynamicResource HighlightBrush}"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="DockPanel.Dock" Value="Top"/>
<Setter Property="TextAlignment" Value="Center"/>
</Style>

</DockPanel.Styles>

<Button FontSize="14" Command="{Binding $parent[Window].DataContext.DisplayMainMenu}">
Return to Main Menu
</Button>

<TextBlock FontSize="52" Text="Thanks &amp; Legal"/>

<TextBlock Classes="personal">
A huge thanks to the Avalonia UI community for the tremendous help and understanding they gave me during my learning
</TextBlock>
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">

<DockPanel Margin="50" VerticalAlignment="Center" HorizontalAlignment="Center">

<DockPanel.Styles>

<Style Selector="Button">
<Setter Property="Margin" Value="0 10"/>
<Setter Property="DockPanel.Dock" Value="Top"/>
</Style>

<Style Selector="DockPanel > TextBlock">
<Setter Property="Margin" Value="0 10"/>
<Setter Property="Foreground" Value="{DynamicResource HighlightBrush}"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="DockPanel.Dock" Value="Top"/>
<Setter Property="TextAlignment" Value="Center"/>
</Style>

</DockPanel.Styles>

<TextBlock Classes="personal">
Thank you to all those who heard me complaining during the construction of this software, and who have anxiously awaited its release (?)
</TextBlock>
<Button FontSize="14" Command="{Binding $parent[Window].DataContext.DisplayMainMenu}">
Return to Main Menu
</Button>

<TextBlock Classes="personal">
Last but not least: thanks to you
</TextBlock>
<TextBlock FontSize="52" Text="Thanks &amp; Legal"/>

<TextBlock Classes="personal" FontWeight="Bold">
Built with &lt;3 from Italy
</TextBlock>
<TextBlock Classes="personal">
A huge thanks to the Avalonia UI community for the tremendous help and understanding they gave me during my learning
</TextBlock>

<TextBlock>
Comquiz is released under MIT Licence: Copyright (c) 2020 Alessio Di Giacomo
</TextBlock>
<TextBlock Classes="personal">
Thank you to all those who heard me complaining during the construction of this software, and who have anxiously awaited its release (?)
</TextBlock>

<TextBlock>
This software makes use of Avalonia UI, granted under MIT licence: Copyright (c) 2014 Steven Kirk
</TextBlock>
<TextBlock Classes="personal">
Last but not least: thanks to you
</TextBlock>

<TextBlock>
This software makes use of MessageBox.Avalonia, granted under MIT licence: Copyright (c) 2019 roman
</TextBlock>
<TextBlock Classes="personal" FontWeight="Bold">
Built with &lt;3 from Italy
</TextBlock>

<TextBlock>
This software makes use of dotnet-bundle, granted under MIT licence: Copyright (c) 2018 Sergey Khabibullin
</TextBlock>
<TextBlock>
Comquiz is released under MIT Licence: Copyright (c) 2020 Alessio Di Giacomo
</TextBlock>

</DockPanel>
<TextBlock>
This software makes use of Avalonia UI, granted under MIT licence: Copyright (c) 2014 Steven Kirk
</TextBlock>

<TextBlock>
This software makes use of MessageBox.Avalonia, granted under MIT licence: Copyright (c) 2019 roman
</TextBlock>

<TextBlock>
This software makes use of dotnet-bundle, granted under MIT licence: Copyright (c) 2018 Sergey Khabibullin
</TextBlock>

<TextBlock>
This software makes use of Roboto font, granted under Apache License 2.0
</TextBlock>

<TextBlock>
This software makes use of Open Dyslexic font, granted under SIL Open Font License. Copyright (c) 2019-07-29, Abbie Gonzalez.
</TextBlock>


</DockPanel>

</ScrollViewer>

</UserControl>
13 changes: 9 additions & 4 deletions comquiz/Views/MainMenuView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@

<!-- QUIZPARTIAL -->

<StackPanel Orientation="Horizontal" Margin="0 10" HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal" Margin="0 5" HorizontalAlignment="Center">

<StackPanel.Styles>

Expand Down Expand Up @@ -198,7 +198,7 @@

</StackPanel>

<TextBlock Margin="0 20 0 0" Text="{x:Static localization:strings.mainMenu_selectOptions}" HorizontalAlignment="Center"/>
<TextBlock Margin="0 5 0 0" Text="{x:Static localization:strings.mainMenu_selectOptions}" HorizontalAlignment="Center"/>

<StackPanel HorizontalAlignment="Center">

Expand Down Expand Up @@ -232,11 +232,16 @@
</Style>

</StackPanel.Styles>


<Border BorderBrush="{DynamicResource HighlightBrush}" Cursor="Hand" BorderThickness="0 0 0 4" Padding="0" Margin="0 0 0 4">
<TextBlock x:Name="txt_font" Text="Change font"/>
</Border>

<TextBlock Text="-"/>
<TextBlock Text="{Binding Version}"/>
<TextBlock Text="-"/>

<Border BorderBrush="{DynamicResource HighlightBrush}" Cursor="Hand" BorderThickness="0 0 0 2" Padding="0">
<Border BorderBrush="{DynamicResource HighlightBrush}" Cursor="Hand" BorderThickness="0 0 0 4" Padding="0" Margin="0 0 0 4">
<TextBlock x:Name="txt_about" Text="Thanks &amp; Legal"/>
</Border>

Expand Down
Loading

0 comments on commit 4b38256

Please sign in to comment.