watsonb8/aurora-sharp-desktop
Archived
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using css after update (Fix your ish Microsoft)

Browse Source
This commit is contained in:
watsonb8 2019-11-30 15:46:09 -05:00
parent 042a0d466a
commit 82b8705a0c
6 changed files with 60 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Aurora.gtk/Aurora.gtk.csproj
View File

@ -2,7 +2,6 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <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\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\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> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform> <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@ -145,9 +144,6 @@
<EmbeddedResource Include="OpenTK.dll.config"> <EmbeddedResource Include="OpenTK.dll.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="webkit-sharp.dll.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="LibVLCSharp.GTK.dll.config"> <EmbeddedResource Include="LibVLCSharp.GTK.dll.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource> </EmbeddedResource>
@ -481,6 +477,7 @@
<None Include="libvlc.dylib"> <None Include="libvlc.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="webkit-sharp.dll.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Aurora\Aurora.csproj"> <ProjectReference Include="..\Aurora\Aurora.csproj">
@ -489,7 +486,6 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <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\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.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')" /> <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')" />

5
Aurora.gtk/Program.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using LibVLCSharp.Forms.Shared; using LibVLCSharp.Forms.Shared;
using Xamarin.Forms;
using Xamarin.Forms.Platform.GTK; using Xamarin.Forms.Platform.GTK;
using Xamarin.Forms.Platform.GTK.Helpers; 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. // For some reason, Xamarin does not pick the LibVLCSharp.Form.Platforms.Gtk assembly as a renderer assembly.
// Add it manually. // 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) if (PlatformHelper.GetGTKPlatform() == GTKPlatform.Windows)

23
Aurora/Aurora.csproj
View File

@ -8,17 +8,19 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" /> <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
<PackageReference Include="Xamarin.Essentials" Version="1.0.1" /> <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
<PackageReference Include="Xamarin.Forms.DataGrid" Version="3.1.0" /> <PackageReference Include="Xamarin.Forms.DataGrid" Version="3.1.0" />
<PackageReference Include="taglib-sharp-netstandard2.0" Version="2.1.0" /> <PackageReference Include="taglib-sharp-netstandard2.0" Version="2.1.0" />
<PackageReference Include="LibVLCSharp.Forms" Version="3.0.0" /> <PackageReference Include="LibVLCSharp.Forms" Version="3.3.1" />
<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3" /> <PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3.1" />
<PackageReference Include="Grpc" Version="1.21.0" /> <PackageReference Include="Grpc" Version="2.25.0" />
<PackageReference Include="Grpc.Tools" Version="1.21.0" PrivateAssests="All" /> <PackageReference Include="Grpc.Tools" Version="2.25.0" PrivateAssests="All"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="Google.Protobuf" Version="3.8.0" /> <PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Google.Protobuf" Version="3.10.1" />
<PackageReference Include="Xam.Plugins.Settings" Version="3.1.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>
<ItemGroup> <ItemGroup>
<Folder Include="Design\" /> <Folder Include="Design\" />
@ -52,4 +54,9 @@
<Protobuf Include="Proto\playback.proto" /> <Protobuf Include="Proto\playback.proto" />
<Protobuf Include="Proto\sync.proto" /> <Protobuf Include="Proto\sync.proto" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Design\Components\NavigationMenu\NavigationMenu.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
</Project> </Project>

24
Aurora/Design/Components/NavigationMenu/NavigationMenu.css Normal file
View 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;
}

54
Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
View File

@ -3,67 +3,31 @@
xmlns="http://xamarin.com/schemas/2014/forms" xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu"> x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu">
<ContentView.Resources>
<StyleSheet
Source="NavigationMenu.css"/>
</ContentView.Resources>
<ContentView.Content> <ContentView.Content>
<StackLayout> <StackLayout x:Name="Layout">
<ListView <ListView
x:Name="MenuItemsListView" x:Name="MenuItemsListView"
SeparatorVisibility="None" SeparatorVisibility="None"
HasUnevenRows="true" HasUnevenRows="true"
BackgroundColor="{StaticResource MenuBackgroundColor}"
IsGroupingEnabled="true" IsGroupingEnabled="true"
CachingStrategy="RecycleElement"> 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> <ListView.GroupHeaderTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <ViewCell x:Name="GroupTemplate">
<Label <Label
VerticalOptions="FillAndExpand" Text="{Binding GroupHeading}"/>
VerticalTextAlignment="Start"
Text="{Binding GroupHeading}"
FontSize="18"
TextColor="White"/>
</ViewCell> </ViewCell>
</DataTemplate> </DataTemplate>
</ListView.GroupHeaderTemplate> </ListView.GroupHeaderTemplate>
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <ViewCell x:Name="ItemTemplate">
<StackLayout
Padding="15,10"
HorizontalOptions="FillAndExpand">
<Label <Label
VerticalOptions="FillAndExpand" Text="{Binding Title}"/>
VerticalTextAlignment="Center"
Text="{Binding Title}"
FontSize="24"/>
</StackLayout>
</ViewCell> </ViewCell>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>

15
Aurora/Services/PlayerService/PlayerService.cs
View File

@ -148,14 +148,13 @@ namespace Aurora.Services.PlayerService
{ {
_mediaPlayer.Position = newPosition; _mediaPlayer.Position = newPosition;
Console.WriteLine(string.Format("**Audio synced**")); Console.WriteLine(string.Format("**Audio synced**"));
Console.WriteLine(string.Format("Remote Server Time {0}", new DateTime(sync.ServerTimeTicks).ToLongTimeString())); // 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("Remote Track Time: {0}", sync.TrackPosition));
Console.WriteLine(string.Format("Local Server Time: {0}", time.DateTime.ToLongTimeString())); // 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("Local Track Time: {0}", _mediaPlayer.Position));
Console.WriteLine(string.Format("Offset: {0}", offset)); // Console.WriteLine(string.Format("Offset: {0}", offset));
Console.WriteLine(string.Format("Old Position: {0}", oldPosition)); // Console.WriteLine(string.Format("Old Position: {0}", oldPosition));
Console.WriteLine(string.Format("New Position: {0}", newPosition)); // Console.WriteLine(string.Format("New Position: {0}", newPosition));
} }
} }
} }