Skip to content

Commit

Permalink
Ajustes finales en los nombres de los álbumes y artistas
Browse files Browse the repository at this point in the history
  • Loading branch information
FedeManzano committed Dec 14, 2023
1 parent ffdbe0d commit 3d2b00d
Show file tree
Hide file tree
Showing 194 changed files with 70,396 additions and 218,012 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified .vs/MediaPlayer/v17/.suo
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
<UserControl x:Class="ReproductorMusicaTagEditables.Controls.DescargarCancion.DescargarCancionControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ReproductorMusicaTagEditables.Controls.DescargarCancion"
xmlns:campo="clr-namespace:ReproductorMusicaTagEditables.Controls.CampoTexto"
xmlns:fa="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:control="http://metro.mahapps.com/winfx/xaml/controls"
mc:Ignorable="d"
x:Name="descarga">

<StackPanel Orientation="Horizontal">
<campo:CampoTextoControl
PlaceholderTexto="URL"
PlaceholderColor="#ccc"
ColorTexto="White"
Fondo="#2A2E32"
Ancho="550"
Texto="{Binding ElementName=descarga, Path=Texto,Mode=TwoWay}"/>
<Button Style="{StaticResource btnGeneral}"
Margin="10 0 0 0"
Click="OnClick"
IsEnabled="{Binding ElementName=descarga, Path=Habilitado}">
<StackPanel Orientation="Horizontal">
<fa:PackIconFontAwesome Style="{StaticResource btnIcon}"
Kind="DownloadSolid" />
<TextBlock Text="Convertir" Foreground="White" Margin="5 0 0 0"/>
</StackPanel>
</Button>
<control:ProgressRing IsActive="{Binding ElementName=descarga, Path=EsVisible}"
Foreground="Red"
Margin="10 0 0 0"
Width="15"
Height="15"
/>
<fa:PackIconFontAwesome Kind="{Binding ElementName=descarga, Path=IconoEstado}"
Foreground="{Binding ElementName=descarga, Path=ColorEstado}"
Margin="10"
Visibility="{Binding ElementName=descarga, Path=Ok}"/>

</StackPanel>
</UserControl>
<UserControl x:Class="ReproductorMusicaTagEditables.Controls.DescargarCancion.DescargarCancionControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:campo="clr-namespace:ReproductorMusicaTagEditables.Controls.CampoTexto"
xmlns:fa="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:control="http://metro.mahapps.com/winfx/xaml/controls"
mc:Ignorable="d"
x:Name="descarga">

<StackPanel Orientation="Horizontal">
<campo:CampoTextoControl
PlaceholderTexto="URL"
PlaceholderColor="#ccc"
ColorTexto="White"
Fondo="#2A2E32"
Ancho="550"
Texto="{Binding ElementName=descarga, Path=Texto,Mode=TwoWay}"/>
<Button Style="{StaticResource btnGeneral}"
Margin="10 0 0 0"
Click="OnClick"
IsEnabled="{Binding ElementName=descarga, Path=Habilitado}">
<StackPanel Orientation="Horizontal">
<fa:PackIconFontAwesome Style="{StaticResource btnIcon}"
Kind="DownloadSolid" />
<TextBlock Text="Convertir" Foreground="White" Margin="5 0 0 0"/>
</StackPanel>
</Button>
<control:ProgressRing IsActive="{Binding ElementName=descarga, Path=EsVisible}"
Foreground="Red"
Margin="10 0 0 0"
Width="15"
Height="15"/>

<fa:PackIconFontAwesome Kind="{Binding ElementName=descarga, Path=IconoEstado}"
Foreground="{Binding ElementName=descarga, Path=ColorEstado}"
Margin="10"
Visibility="{Binding ElementName=descarga, Path=Ok}"/>

</StackPanel>
</UserControl>
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@
<RowDefinition Height="100"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>




<Border Background="{Binding ElementName=infoLista, Path=ImagenUno}" Width="100" Height="100"/>


<StackPanel Grid.Row="1" Margin="0 5 0 0">
<TextBlock Text="{Binding ElementName=infoLista, Path=Nombre}" FontWeight="SemiBold" Foreground="White"/>
<TextBlock Text="{Binding ElementName=infoLista, Path=Artista}" FontSize="10" Foreground="Gray"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ReproductorMusicaTagEditables.Controls.Historial"
mc:Ignorable="d"
MinHeight="140" MinWidth="100"
x:Name="infoLista">


<Grid Cursor="Hand">
<Grid.RowDefinitions>
<RowDefinition Height="100"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:fa="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:tips="clr-namespace:ReproductorMusicaTagEditables.Controls.TipsInfo"
mc:Ignorable="d"
x:Name="infoAlbum">

Expand All @@ -14,7 +13,7 @@

<Border x:Name="bordePrincipal"
CornerRadius="10"
Width="110"
MinWidth="110"
Height="160"
Margin="0 0 20 20"
Padding="3"
Expand All @@ -30,14 +29,15 @@
MouseEnter="borderTrigger_MouseEnter"
MouseLeave="borderTrigger_MouseLeave"
Background="{Binding ElementName=infoAlbum, Path=ImagenAlbum}"
>
HorizontalAlignment="Center"
Width="110">

<Border x:Name="bordeCapa" >
<Button Style="{StaticResource btnMenu}"
Command="{Binding ElementName=infoAlbum, Path=PlayCommand}"
CommandParameter="{Binding ElementName=infoAlbum, Path=PlayParameter}">
Command="{Binding ElementName=infoAlbum, Path=PlayCommand}"
CommandParameter="{Binding ElementName=infoAlbum, Path=PlayParameter}">
<fa:PackIconFontAwesome Kind="PlaySolid"
Style="{StaticResource btnIcon}"/>
Style="{StaticResource btnIcon}"/>
</Button>
</Border>
</Border>
Expand All @@ -50,21 +50,20 @@
</Grid>
<Border.ContextMenu>
<ContextMenu>

<MenuItem Header="Play"
Command="{Binding Parent.PlacementTarget.Tag.PlayCommand,RelativeSource={RelativeSource Self }}"
CommandParameter="{Binding Parent.PlacementTarget.Tag.PlayParameter, RelativeSource={RelativeSource Self}}">
<MenuItem.Icon>
<fa:PackIconFontAwesome Kind="PlaySolid" Foreground="Red"/>
<fa:PackIconFontAwesome Kind="PlaySolid"
Foreground="Red"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Agregar a lista" Click="MenuItem_Click">
<MenuItem Header="Agregar a lista"
Click="MenuItem_Click">
<MenuItem.Icon>
<fa:PackIconFontAwesome Kind="ListAltRegular"/>
</MenuItem.Icon>
</MenuItem>


</ContextMenu>
</Border.ContextMenu>
</Border>
Expand Down
46 changes: 22 additions & 24 deletions ReproductorMusicaTagEditables/Controls/InfoArtista/InfoArtista.xaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
<UserControl x:Class="ReproductorMusicaTagEditables.Controls.InfoArtista.InfoArtista"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
x:Name="infoArtista">

<Control.Resources>
<ResourceDictionary Source="/Controls/InfoArtista/InfoArtistaTheme.xaml"/>
</Control.Resources>
<StackPanel Orientation="Horizontal" Cursor="Hand">
<Border Style="{StaticResource bordeBanner}"
Background="{Binding ElementName=infoArtista, Path=ImagenArtista}"/>


<StackPanel Margin="7 0 0 0" VerticalAlignment="Center">
<TextBlock Style="{StaticResource textoBanner}" Text="{Binding ElementName=infoArtista, Path=NombreArtista}"/>
<TextBlock Style="{StaticResource textoBanner}" Text="{Binding ElementName=infoArtista, Path=NombreAlbum}"/>
<TextBlock Style="{StaticResource textoBanner}" Text="{Binding ElementName=infoArtista, Path=TituloCancion}"/>
</StackPanel>

</StackPanel>
</UserControl>
<UserControl x:Class="ReproductorMusicaTagEditables.Controls.InfoArtista.InfoArtista"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
x:Name="infoArtista">

<Control.Resources>
<ResourceDictionary Source="/Controls/InfoArtista/InfoArtistaTheme.xaml"/>
</Control.Resources>
<StackPanel Orientation="Horizontal" Cursor="Hand">
<Border Style="{StaticResource bordeBanner}"
Background="{Binding ElementName=infoArtista, Path=ImagenArtista}"/>
<StackPanel Margin="7 0 0 0"
VerticalAlignment="Center">
<TextBlock Style="{StaticResource textoBanner}" Text="{Binding ElementName=infoArtista, Path=NombreArtista}"/>
<TextBlock Style="{StaticResource textoBanner}" Text="{Binding ElementName=infoArtista, Path=NombreAlbum}"/>
<TextBlock Style="{StaticResource textoBanner}" Text="{Binding ElementName=infoArtista, Path=TituloCancion}"/>
</StackPanel>
</StackPanel>
</UserControl>
Loading

0 comments on commit 3d2b00d

Please sign in to comment.