alexis.drai
/
AD_MAUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🗂️ *Divide et Impera* and fix a typo

Browse Source
pull/3/head
Alexis Drai 2 years ago
parent f7aefd3eb4
commit c9c169b739
8 changed files with 106 additions and 24 deletions
Show Stats Download Patch File Download Diff File

5
AMC.View/AMC.View.csproj
Unescape View File

@ -72,6 +72,8 @@
<None Remove="Resources\Images\icon_next_dark.png" />
<None Remove="Resources\Images\icon_play.png" />
<None Remove="Resources\Images\icon_play_dark.png" />
<None Remove="Resources\Images\icon_wide_button_play.png" />
<None Remove="Resources\Images\icon_wide_button_shuffle.png" />
</ItemGroup>
<ItemGroup>
@ -110,6 +112,9 @@
<MauiXaml Update="Controls\IconLabelButton.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Controls\IconLabelButtonWide.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Resources\Styles\Values.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>

32
AMC.View/Controls/IconLabelButtonWide.xaml
Unescape View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="AMC.View.Controls.IconLabelButtonWide">
<Frame HeightRequest="{StaticResource SpaceLXL}"
WidthRequest="{StaticResource SpaceXXXL}"
HorizontalOptions="Center"
BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray750}}"
Margin="{StaticResource SpaceXS}"
Padding="{StaticResource SpaceXS}"
CornerRadius="{StaticResource SlightlyRoundedCorners}">
<StackLayout Orientation="Horizontal"
HorizontalOptions="CenterAndExpand"
VerticalOptions="CenterAndExpand"
Spacing="{StaticResource SpaceXXS}">
<ImageButton x:Name="Button"
HeightRequest="{StaticResource SpaceML}"
WidthRequest="{StaticResource SpaceML}" />
<Label x:Name="ButtonLabel"
FontSize="{StaticResource SubSubtitleFontSize}"
HorizontalOptions="Center"
VerticalOptions="Center"
TextColor="{StaticResource Secondary}"/>
</StackLayout>
</Frame>
</ContentView>

43
AMC.View/Controls/IconLabelButtonWide.xaml.cs
Unescape View File

@ -0,0 +1,43 @@
namespace AMC.View.Controls
{
public partial class IconLabelButtonWide : ContentView
{
public static readonly BindableProperty ButtonSourceProperty = BindableProperty.Create(
nameof(ButtonSource),
typeof(string),
typeof(IconLabelButtonWide),
default(string),
propertyChanged: (bindable, oldValue, newValue) =>
{
((IconLabelButtonWide)bindable).Button.Source = (string)newValue;
});
public static readonly BindableProperty ButtonLabelTextProperty = BindableProperty.Create(
nameof(ButtonLabelText),
typeof(string),
typeof(IconLabelButtonWide),
default(string),
propertyChanged: (bindable, oldValue, newValue) =>
{
((IconLabelButtonWide)bindable).ButtonLabel.Text = (string)newValue;
});
public IconLabelButtonWide()
{
InitializeComponent();
}
public string ButtonSource
{
get => (string)GetValue(ButtonSourceProperty);
set => SetValue(ButtonSourceProperty, value);
}
public string ButtonLabelText
{
get => (string)GetValue(ButtonLabelTextProperty);
set => SetValue(ButtonLabelTextProperty, value);
}
}
}

BIN
AMC.View/Resources/Images/icon_wide_button_play.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
AMC.View/Resources/Images/icon_wide_button_shuffle.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

10
AMC.View/Resources/Styles/Values.xaml
Unescape View File

@ -10,9 +10,11 @@
<x:Double x:Key="SpaceM">16</x:Double>
<x:Double x:Key="SpaceML">24</x:Double>
<x:Double x:Key="SpaceL">32</x:Double>
<x:Double x:Key="SpaceXL">64</x:Double>
<x:Double x:Key="SpaceXXL">128</x:Double>
<x:Double x:Key="AlbumPageCoverHeight">320</x:Double>
<x:Double x:Key="SpaceLXL">48</x:Double>
<x:Double x:Key="SpaceXL">64</x:Double>
<x:Double x:Key="SpaceXXL">128</x:Double>
<x:Double x:Key="SpaceXXXL">144</x:Double>
<x:Double x:Key="AlbumPageCoverHeight">320</x:Double>
<Thickness x:Key="BottomBarSpace">0, 0, 0, 128</Thickness>
<Thickness x:Key="TopSpaceSome">0, 24, 0, 0</Thickness>
@ -25,7 +27,7 @@
<Thickness x:Key="WideButtonRight">8, 16, 16, 16</Thickness>
<Thickness x:Key="HSpaceLittleVSpaceVeryLittle">8, 4, 8, 4</Thickness>
<CornerRadius x:Key="SlightlyRoundedCorner">8, 8, 8, 8</CornerRadius>
<CornerRadius x:Key="SlightlyRoundedCorners">8</CornerRadius>
<x:Double x:Key="TitleFontSize">32</x:Double>
<x:Double x:Key="SubtitleFontSize">24</x:Double>

38
AMC.View/Views/AlbumPage.xaml
Unescape View File

@ -27,6 +27,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
@ -35,7 +36,7 @@
Grid.Row="0"
Margin="{StaticResource LeftRightSpaceLarge}">
<Border.StrokeShape>
<RoundRectangle CornerRadius="{StaticResource SlightlyRoundedCorner}" />
<RoundRectangle CornerRadius="{StaticResource SlightlyRoundedCorners}" />
</Border.StrokeShape>
<Image Source="{Binding CoverImage}"
Aspect="AspectFill"/>
@ -56,35 +57,34 @@
</StackLayout>
<StackLayout Grid.Row="2">
<Label Text="{Binding Details, StringFormat='\{0\} · \{1\}'}"
<Label Grid.Row="2"
Text="{Binding Details, StringFormat='\{0\} · \{1\}'}"
FontSize="{StaticResource DetailsFontSize}"
TextColor="{StaticResource Gray}"
HorizontalTextAlignment="Center"/>
<Grid Margin="{StaticResource SpaceXS}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<FlexLayout Grid.Row="3"
Direction="Row"
Margin="{StaticResource SpaceXS}"
JustifyContent="SpaceAround"
AlignItems="Center">
<Button Text="{x:Static strings:Strings.PlayButton}"
Margin="{StaticResource WideButtonLeft}"
Grid.Column="0"/>
<ctl:IconLabelButtonWide ButtonSource="icon_wide_button_play.png"
ButtonLabelText="{x:Static strings:Strings.PlayButton}"
Margin="{StaticResource WideButtonLeft}" />
<Button Text="{x:Static strings:Strings.ShuffleButton}"
Margin="{StaticResource WideButtonRight}"
Grid.Column="1"/>
<ctl:IconLabelButtonWide ButtonSource="icon_wide_button_shuffle.png"
ButtonLabelText="{x:Static strings:Strings.ShuffleButton}"
Margin="{StaticResource WideButtonRight}" />
</Grid>
</FlexLayout>
</StackLayout>
<BoxView Style="{StaticResource HeadGraySeparator}"
Grid.Row="3" />
Grid.Row="4" />
<CollectionView ItemsSource="{Binding Songs}"
Grid.Row="4">
Grid.Row="5">
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="vm:SongViewModel">
<StackLayout>
@ -125,7 +125,7 @@
</CollectionView>
<StackLayout Margin="{StaticResource TopSpaceSome}"
Grid.Row="5">
Grid.Row="6">
<Label Text="{Binding ReleaseDate, StringFormat='{0:d MMMM yyyy}'}"
Style="{StaticResource FooterLabel}" />

2
AMC.View/Views/LibraryPage.xaml
Unescape View File

@ -62,7 +62,7 @@
<StackLayout Margin="{StaticResource SpaceS}">
<Border>
<Border.StrokeShape>
<RoundRectangle CornerRadius="{StaticResource SlightlyRoundedCorner}" />
<RoundRectangle CornerRadius="{StaticResource SlightlyRoundedCorners}" />
</Border.StrokeShape>
<Image Source="{Binding CoverImage}"
Aspect="AspectFill" />

Write Preview
Loading…
Cancel
Save