Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Commit

Permalink
Updated the looks of the AboutDialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@ikarago
ikarago committed Jan 15, 2019
1 parent b6d380a commit 933affd
Show file tree
Hide file tree
Showing 5 changed files with 135 additions and 93 deletions.
13 changes: 13 additions & 0 deletions Talkinator/Talkinator.UWP/Strings/en-us/Resources.resw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,4 +306,17 @@ New in this version are:
<value>Export successful</value>
<comment>Message - Export Successful - Title</comment>
</data>
<data name="About_LinksTitle.Text" xml:space="preserve">
<value>Links</value>
<comment>About - Title of the Links category</comment>
</data>
<data name="About_Translators.Text" xml:space="preserve">
<value>English by Ikarago
*future languages*</value>
<comment>About - List of translators</comment>
</data>
<data name="About_TranslatorsTitle.Text" xml:space="preserve">
<value>Translators</value>
<comment>About - Translators</comment>
</data>
</root>
4 changes: 2 additions & 2 deletions Talkinator/Talkinator.UWP/Styles/TextBlock.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

<!--Common texts-->
<Style x:Key="PageTitleStyle" TargetType="TextBlock">
<!--<Style x:Key="PageTitleStyle" TargetType="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontWeight" Value="SemiLight" />
<Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
Expand All @@ -17,6 +17,6 @@
<Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
</Style>-->

</ResourceDictionary>
7 changes: 5 additions & 2 deletions Talkinator/Talkinator.UWP/Styles/_Thickness.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

<!--Custom size margins-->
<Thickness x:Key="PageTitleMargin">0,0,12,7</Thickness>
<Thickness x:Key="SettingsSubheaderMargin">0, 20, 0, 48</Thickness>
<!--<Thickness x:Key="PageTitleMargin">0,0,12,7</Thickness>
<Thickness x:Key="SettingsSubheaderMargin">0, 20, 0, 48</Thickness>-->
<Thickness x:Key="DialogCategoryMargin">0,0,0,48</Thickness>
<Thickness x:Key="DialogSubcategoryMargin">0,0,0,24</Thickness>
<Thickness x:Key="DialogSubtitleMargin">0,0,0,12</Thickness>

<!--Medium size margins-->
<Thickness x:Key="MediumLeftRightMargin">12,0,12,0</Thickness>
Expand Down
111 changes: 67 additions & 44 deletions Talkinator/Talkinator.UWP/Views/AboutDialog.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,53 +57,76 @@
Command="{x:Bind CloseDialogCommand}"/>
</RelativePanel>

<Grid Grid.Row="1"
Margin="0,12,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<!-- Content -->
<ScrollViewer Grid.Row="1">
<StackPanel Padding="0,12,0,0">
<!-- App info -->
<StackPanel Margin="{StaticResource DialogCategoryMargin}">
<!-- App Title -->
<TextBlock Text="{x:Bind ViewModel.AppName}"
Style="{ThemeResource SubtitleTextBlockStyle}"
FontWeight="Bold"/>
<!-- Version number -->
<TextBlock Text="{x:Bind ViewModel.VersionNumber, Mode=OneWay}"
Margin="0,0,0,4"
Style="{ThemeResource CaptionTextBlockStyle}"/>
<!-- About Description -->
<TextBlock Text="Talkinator, created and programmed by Ikarago, 2016-2018"
x:Uid="About_Description"
TextWrapping="Wrap"
Margin="{StaticResource EightTopMargin}"/>
</StackPanel>

<!-- App logo -->
<Image x:Name="imgLogo"
Grid.Column="0"
Source="/Assets/Logo/in-app/logo-white.png"
Height="38"
Width="38"
VerticalAlignment="Center"/>

<StackPanel Grid.Column="1"
Margin="24,0,12,0">
<!-- App Title -->
<TextBlock Text="{x:Bind ViewModel.AppName}"
Style="{ThemeResource SubtitleTextBlockStyle}"
FontWeight="Bold"/>
<!-- Version number -->
<TextBlock Text="{x:Bind ViewModel.VersionNumber, Mode=OneWay}"
Style="{ThemeResource CaptionTextBlockStyle}"/>
<!-- About Description -->
<TextBlock Text="Talkinator, created and programmed by Ikarago, 2016-2018"
x:Uid="About_Description"
TextWrapping="Wrap"
Margin="{StaticResource EightTopMargin}" />
<!-- Privacy Policy -->
<HyperlinkButton x:Uid="About_PrivacyTermsLink"
Margin="{StaticResource EightTopMargin}"
Content="Privacy Policy"
NavigateUri="https://ikarago.tumblr.com/privacy-policy"/>
<!-- Feedback Hub link-->
<HyperlinkButton Margin="{StaticResource EightTopMargin}"
x:Uid="FeedbackHub_Link"
Content="Feedback"
Command="{x:Bind ViewModel.LaunchFeedbackHubCommand}"
Visibility="{x:Bind ViewModel.FeedbackLinkVisibility}" />
<!-- GitHub Project -->
<HyperlinkButton x:Uid="About_GitHubLink"
Margin="{StaticResource EightTopMargin}"
Content="GitHub project"
NavigateUri="https://github.com/ikarago/Talkinator"/>
<!-- Translators -->
<StackPanel Margin="{StaticResource DialogCategoryMargin}"
Visibility="Collapsed">
<TextBlock x:Uid="About_TranslatorsTitle"
Text="Translators"
FontWeight="Bold"
Margin="{StaticResource DialogSubtitleMargin}"
Style="{StaticResource SubtitleTextBlockStyle}" />
<TextBlock x:Uid="About_Translators"
Text="Sample text"
TextWrapping="Wrap"/>
</StackPanel>


<!-- Links -->
<StackPanel Margin="{StaticResource DialogCategoryMargin}">
<TextBlock x:Uid="About_LinksTitle"
Text="Links"
FontWeight="Bold"
Margin="{StaticResource DialogSubtitleMargin}"
Style="{StaticResource SubtitleTextBlockStyle}" />
<!-- Privacy Policy -->
<HyperlinkButton x:Uid="About_PrivacyTermsLink"
Content="Privacy Policy"
NavigateUri="https://ikarago.com/privacy-policy"/>
<!-- Feedback Hub link-->
<!--<HyperlinkButton x:Uid="FeedbackHub_Link"
Content="Feedback"
Command="{x:Bind ViewModel.LaunchFeedbackHubCommand}"
Visibility="{x:Bind ViewModel.FeedbackLinkVisibility}"/>-->
<!-- GitHub Project -->
<HyperlinkButton x:Uid="About_GitHubLink"
Content="GitHub project"
NavigateUri="https://github.com/ikarago/Talkinator"/>
</StackPanel>
</StackPanel>
</Grid>

</ScrollViewer>

<!-- Dialog background icon -->
<Image x:Name="imgLogo"
Grid.Row="1"
Source="/Assets/Logo/in-app/logo-white.png"
Height="72"
Width="72"
Opacity="0.25"
Visibility="Visible"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"/>

<FontIcon Grid.Row="1"
Canvas.ZIndex="5"
Expand Down
93 changes: 48 additions & 45 deletions Talkinator/Talkinator.UWP/Views/SettingsDialog.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<helper:EnumToBooleanConverter x:Key="EnumToBooleanConverter" EnumType="ElementTheme" />
</ContentDialog.Resources>

<Grid Margin="0">
<Grid>
<contract7Present:Grid.BackgroundTransition>
<contract7Present:BrushTransition />
</contract7Present:Grid.BackgroundTransition>
Expand Down Expand Up @@ -71,55 +71,58 @@
</RelativePanel>

<!-- Content -->
<StackPanel Grid.Row="1"
Canvas.ZIndex="10"
Padding="0,12,0,0"
ScrollViewer.VerticalScrollMode="Auto">
<!-- Personalization -->
<TextBlock Text="Personalization"
x:Uid="Settings_Personalization"
FontWeight="Bold"
Style="{StaticResource SubtitleTextBlockStyle}" />
<ScrollViewer Grid.Row="1">
<StackPanel Padding="0,12,0,0">
<!-- Personalization -->
<StackPanel Margin="{StaticResource DialogCategoryMargin}">
<TextBlock Text="Personalization"
x:Uid="Settings_Personalization"
FontWeight="Bold"
Margin="{StaticResource DialogSubtitleMargin}"
Style="{StaticResource SubtitleTextBlockStyle}" />

<!-- Theme -->
<StackPanel Margin="{StaticResource DialogSubcategoryMargin}">
<TextBlock Text="Theme"
x:Uid="Settings_Theme"
FontWeight="SemiBold"
Style="{StaticResource BodyTextBlockStyle}" />

<!-- Theme -->
<StackPanel Margin="{StaticResource SettingsSubheaderMargin}">
<TextBlock Text="Theme"
x:Uid="Settings_Theme"
FontWeight="SemiBold"
Style="{StaticResource BodyTextStyle}" />
<StackPanel Margin="{StaticResource EightTopMargin}">
<RadioButton x:Uid="Settings_Theme_Light"
GroupName="AppTheme"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}"
Command="{x:Bind ViewModel.SwitchThemeCommand}">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Light</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton x:Uid="Settings_Theme_Dark"
GroupName="AppTheme"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}"
Command="{x:Bind ViewModel.SwitchThemeCommand}">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Dark</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton x:Uid="Settings_Theme_Default"
GroupName="AppTheme"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}"
Command="{x:Bind ViewModel.SwitchThemeCommand}">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Default</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
</StackPanel>
</StackPanel>

<StackPanel Margin="{StaticResource EightTopMargin}">
<RadioButton
x:Uid="Settings_Theme_Light"
GroupName="AppTheme"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}"
Command="{x:Bind ViewModel.SwitchThemeCommand}">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Light</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton
x:Uid="Settings_Theme_Dark"
GroupName="AppTheme"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}"
Command="{x:Bind ViewModel.SwitchThemeCommand}">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Dark</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton
x:Uid="Settings_Theme_Default"
GroupName="AppTheme"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}"
Command="{x:Bind ViewModel.SwitchThemeCommand}">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Default</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
</StackPanel>


</StackPanel>
</StackPanel>
</ScrollViewer>

<!-- Dialog background icon -->
<FontIcon Grid.Row="1"
Canvas.ZIndex="5"
Glyph="&#xE115;"
Expand Down

0 comments on commit 933affd

Please sign in to comment.