Skip to content

Commit

Permalink
[CastIt] Minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfteam committed Nov 7, 2020
1 parent b472fa6 commit 468b77b
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 10 deletions.
15 changes: 12 additions & 3 deletions CastIt/Resources/Resource.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion CastIt/Resources/Resource.es.resx
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
<data name="Minimize" xml:space="preserve">
<value>Minimizar</value>
</data>
<data name="Mazimize" xml:space="preserve">
<data name="Maximize" xml:space="preserve">
<value>Maximixar</value>
</data>
<data name="Dark" xml:space="preserve">
Expand Down Expand Up @@ -534,4 +534,7 @@
<data name="Loading" xml:space="preserve">
<value>Cargando</value>
</data>
<data name="Volume" xml:space="preserve">
<value>Volumen</value>
</data>
</root>
7 changes: 5 additions & 2 deletions CastIt/Resources/Resource.resx
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@
<data name="Minimize" xml:space="preserve">
<value>Minimize</value>
</data>
<data name="Mazimize" xml:space="preserve">
<value>Mazimize</value>
<data name="Maximize" xml:space="preserve">
<value>Maximize</value>
</data>
<data name="Dark" xml:space="preserve">
<value>Dark</value>
Expand Down Expand Up @@ -534,4 +534,7 @@
<data name="Loading" xml:space="preserve">
<value>Loading</value>
</data>
<data name="Volume" xml:space="preserve">
<value>Volume</value>
</data>
</root>
3 changes: 2 additions & 1 deletion CastIt/ViewModels/SplashViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public override Task Initialize()
{
FileUtils.DeleteFilesInDirectory(FileUtils.GetPreviewsPath(), DateTime.Now.AddDays(-1));
FileUtils.DeleteFilesInDirectory(FileUtils.GetLogsPath(), DateTime.Now.AddDays(-3));
Logger.Info($"{nameof(Initialize)}: Old files were deleted");
}
catch (Exception e)
{
Expand Down Expand Up @@ -102,7 +103,7 @@ private async void TimerElapsed(object sender, ElapsedEventArgs e)
}

Logger.Info($"{nameof(Initialize)}: Navigating to main view model...");
await _navigationService.Navigate<MainViewModel, List<PlayListItemViewModel>>(playLists);
await _navigationService.Navigate<MainViewModel, List<PlayListItemViewModel>>(playLists).ConfigureAwait(false);
_beforeNavigatingToMainViewModel.Raise();
}
}
Expand Down
4 changes: 4 additions & 0 deletions CastIt/Views/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,13 @@

<uc:MainProgressBar
Grid.Row="2"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="5,0,5,0" />

<Grid
Grid.Row="3"
Grid.Column="0"
Grid.ColumnSpan="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Expand All @@ -113,6 +115,7 @@
<dragablz:TabablzControl
x:Name="PlayListTabControl"
Grid.Row="3"
Grid.Column="0"
Grid.ColumnSpan="2"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Expand Down Expand Up @@ -141,6 +144,7 @@

<materialDesign:Snackbar
Grid.Row="4"
Grid.Column="0"
Grid.ColumnSpan="2"
HorizontalAlignment="Stretch"
Background="{DynamicResource WindowBackground}"
Expand Down
4 changes: 3 additions & 1 deletion CastIt/Views/UserControls/DiscoveredDevices.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
TextTrimming="CharacterEllipsis"
TextWrapping="Wrap" />
<Button
Grid.Row="0"
Grid.RowSpan="2"
Grid.Column="2"
VerticalAlignment="Center"
Expand All @@ -67,6 +68,7 @@
<materialDesign:PackIcon Kind="CastConnected" />
</Button>
<Button
Grid.Row="0"
Grid.RowSpan="2"
Grid.Column="2"
VerticalAlignment="Center"
Expand Down Expand Up @@ -123,7 +125,7 @@
Grid.Row="1"
Padding="16"
materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
ScrollViewer.VerticalScrollBarVisibility="Auto">
VerticalScrollBarVisibility="Auto">
<ItemsControl
ItemTemplate="{StaticResource DeviceItemTemplate}"
ItemsSource="{Binding Devices}"
Expand Down
3 changes: 2 additions & 1 deletion CastIt/Views/UserControls/PlayListItem.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<materialDesign:PackIcon VerticalAlignment="Center" Kind="VolumeHigh" />
<TextBlock
Margin="5,5"
Text="Volumne"
Text="{Binding [Volume]}"
TextAlignment="Center" />
</StackPanel>
<Slider
Expand Down Expand Up @@ -596,6 +596,7 @@
</ListView>

<Popup
Grid.Row="0"
IsOpen="{Binding ShowAddUrlPopUp, Mode=TwoWay}"
Placement="Center"
PlacementTarget="{Binding ElementName=PlaylistLv}"
Expand Down
1 change: 1 addition & 0 deletions CastIt/Views/UserControls/PlayListItemHeader.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap" />
<Popup
Grid.Column="0"
IsOpen="{Binding ShowEditPopUp, Mode=TwoWay}"
Placement="Bottom"
PlacementTarget="{Binding ElementName=PlayListTitle}"
Expand Down
2 changes: 1 addition & 1 deletion CastIt/Views/UserControls/WindowButtons.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<Button
Click="Maximize_Clicked"
Style="{StaticResource WindowButtonStyle}"
ToolTip="{Binding [Mazimize]}">
ToolTip="{Binding [Maximize]}">
<materialDesign:PackIcon
Width="18"
Height="18"
Expand Down

0 comments on commit 468b77b

Please sign in to comment.