Using css after update (Fix your ish Microsoft)
This commit is contained in:
watsonb8
parent
042a0d466a
commit
82b8705a0c
@ -2,7 +2,6 @@
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props')" />
|
||||
<Import Project="..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.props')" />
|
||||
<Import Project="..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
|
||||
@ -145,9 +144,6 @@
|
||||
<EmbeddedResource Include="OpenTK.dll.config">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="webkit-sharp.dll.config">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LibVLCSharp.GTK.dll.config">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
@ -481,6 +477,7 @@
|
||||
<None Include="libvlc.dylib">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="webkit-sharp.dll.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Aurora\Aurora.csproj">
|
||||
@ -489,7 +486,6 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.targets')" />
|
||||
<Import Project="..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets')" />
|
||||
<Import Project="..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.targets')" />
|
||||
<Import Project="..\packages\Grpc.Core.1.21.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.1.21.0\build\net45\Grpc.Core.targets')" />
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
using System;
|
||||
using LibVLCSharp.Forms.Shared;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Platform.GTK;
|
||||
using Xamarin.Forms.Platform.GTK.Helpers;
|
||||
|
||||
@ -16,7 +15,9 @@ namespace Aurora.gtk
|
||||
|
||||
// For some reason, Xamarin does not pick the LibVLCSharp.Form.Platforms.Gtk assembly as a renderer assembly.
|
||||
// Add it manually.
|
||||
global::Xamarin.Forms.Forms.Init(new[] { typeof(LibVLCSharp.Forms.Platforms.GTK.VideoViewRenderer).Assembly });
|
||||
|
||||
//Also css doesn't work without adding the Xaml assembly
|
||||
global::Xamarin.Forms.Forms.Init(new[] { typeof(LibVLCSharp.Forms.Platforms.GTK.VideoViewRenderer).Assembly, typeof(Xamarin.Forms.Xaml.ArrayExtension).Assembly });
|
||||
|
||||
|
||||
if (PlatformHelper.GetGTKPlatform() == GTKPlatform.Windows)
|
||||
|
||||
@ -8,17 +8,19 @@
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.0.1" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
|
||||
<PackageReference Include="Xamarin.Forms.DataGrid" Version="3.1.0" />
|
||||
<PackageReference Include="taglib-sharp-netstandard2.0" Version="2.1.0" />
|
||||
<PackageReference Include="LibVLCSharp.Forms" Version="3.0.0" />
|
||||
<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3" />
|
||||
<PackageReference Include="Grpc" Version="1.21.0" />
|
||||
<PackageReference Include="Grpc.Tools" Version="1.21.0" PrivateAssests="All" />
|
||||
<PackageReference Include="Google.Protobuf" Version="3.8.0" />
|
||||
<PackageReference Include="LibVLCSharp.Forms" Version="3.3.1" />
|
||||
<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3.1" />
|
||||
<PackageReference Include="Grpc" Version="2.25.0" />
|
||||
<PackageReference Include="Grpc.Tools" Version="2.25.0" PrivateAssests="All"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Google.Protobuf" Version="3.10.1" />
|
||||
<PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
|
||||
<PackageReference Include="Sharpnado.Forms.HorizontalListView" Version="1.2.0" />
|
||||
<PackageReference Include="Sharpnado.Forms.HorizontalListView" Version="1.3.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Design\" />
|
||||
@ -52,4 +54,9 @@
|
||||
<Protobuf Include="Proto\playback.proto" />
|
||||
<Protobuf Include="Proto\sync.proto" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="Design\Components\NavigationMenu\NavigationMenu.css">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
24
Aurora/Design/Components/NavigationMenu/NavigationMenu.css
Normal file
24
Aurora/Design/Components/NavigationMenu/NavigationMenu.css
Normal file
@ -0,0 +1,24 @@
|
||||
#Layout {
|
||||
background-color: #232323;
|
||||
}
|
||||
|
||||
ListView {
|
||||
background-color: #232323;
|
||||
margin-left: 20;
|
||||
margin-top: 20;
|
||||
}
|
||||
|
||||
#GroupTemplate Label {
|
||||
color: white;
|
||||
font-size: 14;
|
||||
font-family: Courier New, Courier, monospace;
|
||||
font-weight: 100;
|
||||
margin-top: 500;
|
||||
}
|
||||
|
||||
#ItemTemplate label {
|
||||
color: white;
|
||||
font-size: 18;
|
||||
font-family: Courier New, Courier, monospace;
|
||||
font-weight: 400;
|
||||
}
|
||||
@ -3,67 +3,31 @@
|
||||
xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu">
|
||||
<ContentView.Resources>
|
||||
<StyleSheet
|
||||
Source="NavigationMenu.css"/>
|
||||
</ContentView.Resources>
|
||||
<ContentView.Content>
|
||||
<StackLayout>
|
||||
<StackLayout x:Name="Layout">
|
||||
<ListView
|
||||
x:Name="MenuItemsListView"
|
||||
SeparatorVisibility="None"
|
||||
HasUnevenRows="true"
|
||||
BackgroundColor="{StaticResource MenuBackgroundColor}"
|
||||
IsGroupingEnabled="true"
|
||||
CachingStrategy="RecycleElement">
|
||||
<ListView.Header>
|
||||
<Grid
|
||||
BackgroundColor="#03A9F4">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition
|
||||
Width="10"/>
|
||||
<ColumnDefinition
|
||||
Width="*"/>
|
||||
<ColumnDefinition
|
||||
Width="10"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition
|
||||
Height="30"/>
|
||||
<RowDefinition
|
||||
Height="80"/>
|
||||
<RowDefinition
|
||||
Height="Auto"/>
|
||||
<RowDefinition
|
||||
Height="10"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Label
|
||||
Grid.Column="1"
|
||||
Grid.Row="2"
|
||||
Text="Aurora"
|
||||
Style="{DynamicResource SubtitleStyle}"/>
|
||||
</Grid>
|
||||
</ListView.Header>
|
||||
<ListView.GroupHeaderTemplate>
|
||||
<DataTemplate>
|
||||
<ViewCell>
|
||||
<ViewCell x:Name="GroupTemplate">
|
||||
<Label
|
||||
VerticalOptions="FillAndExpand"
|
||||
VerticalTextAlignment="Start"
|
||||
Text="{Binding GroupHeading}"
|
||||
FontSize="18"
|
||||
TextColor="White"/>
|
||||
Text="{Binding GroupHeading}"/>
|
||||
</ViewCell>
|
||||
</DataTemplate>
|
||||
</ListView.GroupHeaderTemplate>
|
||||
<ListView.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<ViewCell>
|
||||
<StackLayout
|
||||
Padding="15,10"
|
||||
HorizontalOptions="FillAndExpand">
|
||||
<Label
|
||||
VerticalOptions="FillAndExpand"
|
||||
VerticalTextAlignment="Center"
|
||||
Text="{Binding Title}"
|
||||
FontSize="24"/>
|
||||
</StackLayout>
|
||||
<ViewCell x:Name="ItemTemplate">
|
||||
<Label
|
||||
Text="{Binding Title}"/>
|
||||
</ViewCell>
|
||||
</DataTemplate>
|
||||
</ListView.ItemTemplate>
|
||||
|
||||
@ -148,14 +148,13 @@ namespace Aurora.Services.PlayerService
|
||||
{
|
||||
_mediaPlayer.Position = newPosition;
|
||||
Console.WriteLine(string.Format("**Audio synced**"));
|
||||
Console.WriteLine(string.Format("Remote Server Time {0}", new DateTime(sync.ServerTimeTicks).ToLongTimeString()));
|
||||
Console.WriteLine(string.Format("Remote Track Time: {0}", sync.TrackPosition));
|
||||
Console.WriteLine(string.Format("Local Server Time: {0}", time.DateTime.ToLongTimeString()));
|
||||
Console.WriteLine(string.Format("Local Track Time: {0}", _mediaPlayer.Position));
|
||||
Console.WriteLine(string.Format("Offset: {0}", offset));
|
||||
Console.WriteLine(string.Format("Old Position: {0}", oldPosition));
|
||||
Console.WriteLine(string.Format("New Position: {0}", newPosition));
|
||||
|
||||
// Console.WriteLine(string.Format("Remote Server Time {0}", new DateTime(sync.ServerTimeTicks).ToLongTimeString()));
|
||||
// Console.WriteLine(string.Format("Remote Track Time: {0}", sync.TrackPosition));
|
||||
// Console.WriteLine(string.Format("Local Server Time: {0}", time.DateTime.ToLongTimeString()));
|
||||
// Console.WriteLine(string.Format("Local Track Time: {0}", _mediaPlayer.Position));
|
||||
// Console.WriteLine(string.Format("Offset: {0}", offset));
|
||||
// Console.WriteLine(string.Format("Old Position: {0}", oldPosition));
|
||||
// Console.WriteLine(string.Format("New Position: {0}", newPosition));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user