Skip to content

Commit

Permalink
Build for p13
Browse files Browse the repository at this point in the history
  • Loading branch information
@Redth
Redth committed Feb 15, 2022
1 parent 962b15c commit e68f3cd
Show file tree
Hide file tree
Showing 17 changed files with 150 additions and 337 deletions.
2 changes: 1 addition & 1 deletion Directory.build.props
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<MauiV>6.0.200-preview.12.2441</MauiV>

</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Mobile/Controls/HeaderControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Label Text="See All Categories"
Style="{StaticResource BodyLLabelStyle}"
TextColor="{StaticResource Primary}"
GridLayout.Row="1"
Grid.Row="1"
HorizontalOptions="End"
Margin="0,0,30,0"
IsVisible="{Binding ShowSearchCategories, Source={x:Reference selfMediaElementView}}"
Expand All @@ -38,7 +38,7 @@
VerticalOptions="Center"
HorizontalOptions="Start" />
<Image Source="search.png"
GridLayout.Column="1"
Grid.Column="1"
VerticalOptions="Center"
HorizontalOptions="End"
HeightRequest="20"
Expand Down
16 changes: 8 additions & 8 deletions src/Mobile/Controls/Player.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Grid ColumnDefinitions="*,auto"
RowDefinitions="auto"
Padding="8">
<VerticalStackLayout GridLayout.Column="0"
<VerticalStackLayout Grid.Column="0"
VerticalOptions="Start">
<Label x:Name="epiosdeTitle"
FontSize="Medium"
Expand All @@ -35,7 +35,7 @@
HorizontalOptions="Center"
VerticalOptions="Center"
HeightRequest="38"
GridLayout.Column="1"
Grid.Column="1"
Clicked="PlayGesture_Tapped"
Aspect="AspectFill">
</ImageButton>
Expand All @@ -53,20 +53,20 @@
WidthRequest="56"
HeightRequest="56"
HorizontalOptions="Center"
GridLayout.RowSpan="2" />
<Label GridLayout.Column="1"
Grid.RowSpan="2" />
<Label Grid.Column="1"
Text="{Binding Text, Source={x:Reference epiosdeTitle}}"
FontSize="Medium"
TextColor="White"
MaxLines="1" />
<Label Text="{Binding Text, Source={x:Reference authorText}}"
GridLayout.Row="1"
GridLayout.Column="1"
Grid.Row="1"
Grid.Column="1"
FontSize="Small"
TextColor="White" />
</Grid>

<Grid GridLayout.Column="1"
<Grid Grid.Column="1"
HorizontalOptions="Center"
RowDefinitions="auto,auto"
VerticalOptions="Center">
Expand All @@ -81,7 +81,7 @@
</Image.GestureRecognizers>
</Image>

<Label GridLayout.Row="1"
<Label Grid.Row="1"
x:Name="duration"
HorizontalOptions="Center"
FontSize="Small"
Expand Down
2 changes: 1 addition & 1 deletion src/Mobile/Microsoft.NetConf2021.Maui.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<MauiVersion>$(MauiV)</MauiVersion>

<ImplicitUsings>enable</ImplicitUsings>
<!-- Display name -->
<ApplicationTitle>.NET Pods</ApplicationTitle>
Expand Down
2 changes: 1 addition & 1 deletion src/Mobile/Pages/CategoryPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Margin="5"
ShowSearchCategories="False"
IsVisible="{OnIdiom Default=true, Phone=false}"
GridLayout.Row="0"
Grid.Row="0"
VerticalOptions="Start" />

<Label Text="{Binding Category.Genre}"
Expand Down
6 changes: 3 additions & 3 deletions src/Mobile/Pages/EpisodeDetailPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
Command="{Binding PlayCommand}"
SemanticProperties.Hint="Play the episode"
Text="{x:Static res:AppResource.Play}" />
<Label GridLayout.Column="1"
<Label Grid.Column="1"
Style="{StaticResource BodySLabelStyle}"
Text="{Binding Episode.Duration, Converter={StaticResource DurationConverter}}"
VerticalOptions="Center" />
<ImageButton GridLayout.Column="2"
<ImageButton Grid.Column="2"
HeightRequest="28"
Aspect="AspectFill"
Source="sare_button.png"
Expand All @@ -44,7 +44,7 @@
Command="{Binding ShareCommand}"
WidthRequest="28">
</ImageButton>
<ImageButton GridLayout.Column="3"
<ImageButton Grid.Column="3"
HeightRequest="28"
Aspect="AspectFill"
Source="clockpink.png"
Expand Down
16 changes: 8 additions & 8 deletions src/Mobile/Pages/ListenLaterPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
Text="{Binding Episode.Duration }"
TextColor="{StaticResource Grey7}" />
</StackLayout>
<StackLayout GridLayout.Column="1">
<StackLayout Grid.Column="1">
<StackLayout Orientation="Horizontal"
HorizontalOptions="StartAndExpand"
Spacing="5">
Expand All @@ -54,18 +54,18 @@
<Grid HorizontalOptions="FillAndExpand"
RowDefinitions="auto,auto,auto">
<Label Text="{Binding Episode.Title}"
GridLayout.Row="0"
Grid.Row="0"
HorizontalOptions="FillAndExpand"
Style="{StaticResource LinkLLabelStyle}" />
<Label Text="{Binding Show.Title}"
HorizontalOptions="FillAndExpand"
Style="{OnIdiom Desktop={StaticResource H4LabelStyle}, Phone={StaticResource H6LabelStyle}}"
GridLayout.Row="1" />
Grid.Row="1" />
<Label Text="{Binding Episode.Published, StringFormat='{0:MMM dd, yyyy}'}"
HorizontalOptions="FillAndExpand"
Style="{StaticResource BodySLabelStyle}"
TextColor="{StaticResource Grey7}"
GridLayout.Row="2" />
Grid.Row="2" />
</Grid>
</StackLayout>
<Label Text="{Binding Episode.Description}"
Expand All @@ -77,7 +77,7 @@
</StackLayout>

<Image Aspect="AspectFit"
GridLayout.Column="2"
Grid.Column="2"
VerticalOptions="Center"
HeightRequest="24"
Source="listenlaterfilled.png"
Expand All @@ -91,9 +91,9 @@
</Image.GestureRecognizers>
</Image>
<StackLayout VerticalOptions="End"
GridLayout.Row="1"
Grid.Row="1"
Margin="0,5"
GridLayout.ColumnSpan="3"
Grid.ColumnSpan="3"
BackgroundColor="{StaticResource Grey4}">
<BoxView HeightRequest="1" />
</StackLayout>
Expand All @@ -111,7 +111,7 @@
VerticalOptions="Center" />
<StackLayout HorizontalOptions="CenterAndExpand"
VerticalOptions="CenterAndExpand"
GridLayout.Row="1"
Grid.Row="1"
Spacing="20">
<Label Text="You don't have any episodes saved yet."
Style="{StaticResource BodySLabelStyle}"
Expand Down
2 changes: 1 addition & 1 deletion src/Mobile/Pages/ListenTogetherPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</b:BlazorWebView>

<controls:Player x:Name="player"
GridLayout.Row="1"
Grid.Row="1"
VerticalOptions="End">
</controls:Player>
</Grid>
Expand Down
42 changes: 21 additions & 21 deletions src/Mobile/Pages/SettingsPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,61 +13,61 @@
<Label Text="{x:Static res:AppResource.Download_Settings}"
Margin="0,0,0,20"
Style="{StaticResource H6LabelStyle}"
GridLayout.ColumnSpan="2"/>
Grid.ColumnSpan="2"/>
<Switch
GridLayout.Row="1"
Grid.Row="1"
HorizontalOptions="Center"/>
<Label Text="{x:Static res:AppResource.Autodownload_Using_Data}"
GridLayout.Column="1"
GridLayout.Row="1"
Grid.Column="1"
Grid.Row="1"
Style="{StaticResource BodySLabelStyle}"
VerticalOptions="Center"/>
<Label Text="{x:Static res:AppResource.Autodownload_Using_Data_Subtitle}"
GridLayout.Column="1"
GridLayout.Row="2"
Grid.Column="1"
Grid.Row="2"
Style="{StaticResource BodySLabelStyle}"/>
<Switch HorizontalOptions="Center"
GridLayout.Row="3"
Grid.Row="3"
Margin="0,24,0,0"/>
<Label Text="{x:Static res:AppResource.Delete_Played_Episodes}"
GridLayout.Column="1"
GridLayout.Row="3"
Grid.Column="1"
Grid.Row="3"
Margin="0,24,0,0"
VerticalOptions="Center"
Style="{StaticResource BodySLabelStyle}"/>
<Switch HorizontalOptions="Center"
GridLayout.Row="4"
Grid.Row="4"
IsToggled="{Binding IsDarkModeEnabled}"
Margin="0,24,0,0"/>
<Label Text="{x:Static res:AppResource.Dark_Mode}"
GridLayout.Column="1"
GridLayout.Row="4"
Grid.Column="1"
Grid.Row="4"
Margin="0,24,0,0"
VerticalOptions="Center"
Style="{StaticResource BodySLabelStyle}"/>
<Switch HorizontalOptions="Center"
GridLayout.Row="5"
Grid.Row="5"
IsVisible="{OnIdiom Default=false,Phone=true}"
IsToggled="{Binding IsWifiOnlyEnabled}"
Margin="0,24,0,0"/>
<Label Text="{x:Static res:AppResource.Only_Wifi}"
GridLayout.Column="1"
GridLayout.Row="5"
Grid.Column="1"
Grid.Row="5"
Margin="0,24,0,0"
IsVisible="{OnIdiom Default=false,Phone=true}"
VerticalOptions="Center"
Style="{StaticResource BodySLabelStyle}"/>
<Label
GridLayout.ColumnSpan="2"
GridLayout.Row="6"
Grid.ColumnSpan="2"
Grid.Row="6"
Margin="0,48,0,0"
VerticalOptions="Center"
Text="{x:Static res:AppResource.Settings_Info}"
TextColor="{AppThemeBinding Light={StaticResource Dark},Dark={StaticResource Grey1}}"
Style="{StaticResource BodySLabelStyle}"/>
<Label
GridLayout.ColumnSpan="2"
GridLayout.Row="7"
Grid.ColumnSpan="2"
Grid.Row="7"
Margin="0,11,0,0"
VerticalOptions="Center"
Style="{StaticResource BodySLabelStyle}">
Expand All @@ -80,8 +80,8 @@
</Label.FormattedText>
</Label>
<Label Text="Version 10.16.541_1699"
GridLayout.ColumnSpan="2"
GridLayout.Row="7"
Grid.ColumnSpan="2"
Grid.Row="7"
Margin="0,11,0,0"
VerticalOptions="Center"
Style="{StaticResource BodySLabelStyle}"/>
Expand Down
44 changes: 22 additions & 22 deletions src/Mobile/Pages/ShowDetailPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
CommandParameter="{Binding}" />
</Grid.GestureRecognizers>
<ImageButton Aspect="AspectFill"
GridLayout.Column="0"
GridLayout.Row="0"
Grid.Column="0"
Grid.Row="0"
HeightRequest="38"
Source="player_play.png"
VerticalOptions="Center"
Expand All @@ -43,22 +43,22 @@
WidthRequest="38">
</ImageButton>

<Label GridLayout.Column="0"
GridLayout.Row="1"
<Label Grid.Column="0"
Grid.Row="1"
Style="{StaticResource BodySLabelStyle}"
Text="{Binding Duration, Converter={StaticResource DurationConverter}}" />
<Label GridLayout.Column="1"
GridLayout.Row="1"
<Label Grid.Column="1"
Grid.Row="1"
Style="{StaticResource BodySLabelStyle}"
Text="{Binding Published, StringFormat='{0:MMM dd, yyyy}'}" />
<Label GridLayout.Column="1"
GridLayout.Row="0"
<Label Grid.Column="1"
Grid.Row="0"
HorizontalOptions="FillAndExpand"
VerticalOptions="Center"
Style="{StaticResource LinkLLabelStyle}"
Text="{Binding Title}" />
<ImageButton Aspect="AspectFill"
GridLayout.Column="1"
Grid.Column="1"
HorizontalOptions="End"
VerticalOptions="Center"
HeightRequest="24"
Expand Down Expand Up @@ -92,32 +92,32 @@
RowSpacing="{OnIdiom Default=10, Phone=6}">

<Image Aspect="AspectFit"
GridLayout.Column="0"
GridLayout.Row="0"
GridLayout.RowSpan="{OnIdiom Default=5, Phone=3}"
Grid.Column="0"
Grid.Row="0"
Grid.RowSpan="{OnIdiom Default=5, Phone=3}"
HeightRequest="{OnIdiom Default=230, Phone=156}"
Source="{Binding Show.Image, FallbackValue=default_podcast_image.png}"
WidthRequest="{OnIdiom Default=230, Phone=156}" />
<Label GridLayout.Column="1"
GridLayout.Row="0"
<Label Grid.Column="1"
Grid.Row="0"
HorizontalOptions="Start"
Style="{OnIdiom Default={StaticResource H4LabelStyle}, Phone={StaticResource H6LabelStyle}}"
Text="{Binding Show.Title}" />
<Label GridLayout.Column="1"
GridLayout.Row="1"
<Label Grid.Column="1"
Grid.Row="1"
Style="{StaticResource BodyMLabelStyle}"
Text="{Binding Show.Author}"
TextColor="{AppThemeBinding Light={StaticResource Grey7},Dark={StaticResource Grey4}}" />
<Label GridLayout.Column="{OnIdiom Default=1, Phone=0}"
GridLayout.Row="{OnIdiom Default=2, Phone=4}"
GridLayout.ColumnSpan="{OnIdiom Default=1, Phone=2}"
<Label Grid.Column="{OnIdiom Default=1, Phone=0}"
Grid.Row="{OnIdiom Default=2, Phone=4}"
Grid.ColumnSpan="{OnIdiom Default=1, Phone=2}"
TextColor="{AppThemeBinding Light={StaticResource Dark},Dark={StaticResource Grey1}}"
Style="{StaticResource BodyMLabelStyle}"
Text="{Binding Show.Description}" />
<Button BackgroundColor="{StaticResource Primary}"
GridLayout.Column="{OnIdiom Default=1,Phone=0}"
GridLayout.ColumnSpan="{OnIdiom Default=1, Phone=2}"
GridLayout.Row="{OnIdiom Default=4, Phone=3}"
Grid.Column="{OnIdiom Default=1,Phone=0}"
Grid.ColumnSpan="{OnIdiom Default=1, Phone=2}"
Grid.Row="{OnIdiom Default=4, Phone=3}"
Command="{Binding SubscribeCommand}"
Text="{x:Static res:AppResource.Subscribe}">
<Button.Triggers>
Expand Down
2 changes: 1 addition & 1 deletion src/Mobile/Pages/SubscriptionsPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
VerticalOptions="Center"/>
<StackLayout HorizontalOptions="CenterAndExpand"
VerticalOptions="CenterAndExpand"
GridLayout.Row="1"
Grid.Row="1"
Spacing="20">
<Label Text="You haven't subscribed to any channel yet."
Style="{StaticResource BodySLabelStyle}"
Expand Down
9 changes: 1 addition & 8 deletions src/Mobile/Platforms/Windows/App.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.UI.Xaml;


// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.
Expand All @@ -20,11 +20,4 @@ public App()
}

protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();

protected override void OnLaunched(LaunchActivatedEventArgs args)
{
base.OnLaunched(args);

Microsoft.Maui.Essentials.Platform.OnLaunched(args);
}
}
Loading

0 comments on commit e68f3cd

Please sign in to comment.