Skip to content
This repository has been archived by the owner on Dec 18, 2023. It is now read-only.

Commit

Permalink
Update for better compat with Live Player
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesmontemagno
jamesmontemagno committed Nov 21, 2017
1 parent 3a11c29 commit d39e6b6
Show file tree
Hide file tree
Showing 16 changed files with 398 additions and 349 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#OS junk files
[Tt]humbs.db
*.DS_Store

.vs/
#Visual Studio files
*.[Oo]bj
*.user
Expand Down
174 changes: 104 additions & 70 deletions Hanselman.Android/Hanselman.Android.csproj
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Hanselman.Android/MainActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public class MainActivity : FormsAppCompatActivity

protected override void OnCreate(Bundle bundle)
{
FormsAppCompatActivity.ToolbarResource = Resource.Layout.toolbar;
FormsAppCompatActivity.TabLayoutResource = Resource.Layout.tabs;
FormsAppCompatActivity.ToolbarResource = Resource.Layout.Toolbar;
FormsAppCompatActivity.TabLayoutResource = Resource.Layout.Tabbar;
base.OnCreate(bundle);
Forms.Init(this, bundle);
Plugin.MediaManager.Forms.Android.VideoViewRenderer.Init();
Expand Down
0 Hanselman.Android/Resources/layout/tabs.axml → ...lman.Android/Resources/layout/Tabbar.axml
View file
File renamed without changes.
46 changes: 23 additions & 23 deletions Hanselman.Android/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid71" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid71" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid71" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="monoandroid71" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="monoandroid80" />
<package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid60" />
<package id="Plugin.MediaManager" version="0.4.0" targetFramework="monoandroid71" />
<package id="Plugin.MediaManager.Forms" version="0.4.0" targetFramework="monoandroid71" />
<package id="Plugin.Share" version="6.1.0.19-beta" targetFramework="monoandroid71" />
<package id="Plugin.MediaManager" version="0.4.5" targetFramework="monoandroid80" />
<package id="Plugin.MediaManager.Forms" version="0.4.5" targetFramework="monoandroid80" />
<package id="Plugin.Share" version="7.0.1" targetFramework="monoandroid80" />
<package id="Rx-Core" version="2.2.5" targetFramework="MonoAndroid50" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="MonoAndroid50" />
<package id="Rx-Linq" version="2.2.5" targetFramework="MonoAndroid50" />
Expand Down Expand Up @@ -66,23 +66,23 @@
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid71" />
<package id="Xam.Plugins.Forms.ImageCircle" version="1.8.2.19-beta" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Annotations" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Compat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.UI" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.Utils" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.CustomTabs" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Design" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Fragment" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Media.Compat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Transition" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v4" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.CardView" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.Palette" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Build.Download" version="0.4.5" targetFramework="monoandroid71" />
<package id="Xamarin.Forms" version="2.3.4.247" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Core.UI" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.CustomTabs" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Design" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Fragment" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Transition" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.v4" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.v7.CardView" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.v7.Palette" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Build.Download" version="0.4.7" targetFramework="monoandroid80" />
<package id="Xamarin.Forms" version="2.5.0.91635" targetFramework="monoandroid80" />
</packages>
29 changes: 13 additions & 16 deletions Hanselman.Portable/Hanselman.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,22 @@
<HintPath>..\packages\LinqToTwitter.3.1.2\lib\portable-win8+net45+wp8\LinqToTwitterPcl.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\portable-net45+win8+wpa81+wp8\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\portable-net45+win8+wp8+wpa81\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Plugin.MediaManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.MediaManager.0.4.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Plugin.MediaManager.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Plugin.MediaManager.0.4.5\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Plugin.MediaManager.dll</HintPath>
</Reference>
<Reference Include="Plugin.MediaManager.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.MediaManager.0.4.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Plugin.MediaManager.Abstractions.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Plugin.MediaManager.0.4.5\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Plugin.MediaManager.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Plugin.MediaManager.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.MediaManager.Forms.0.4.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Plugin.MediaManager.Forms.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Plugin.MediaManager.Forms.0.4.5\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Plugin.MediaManager.Forms.dll</HintPath>
</Reference>
<Reference Include="Plugin.Share, Version=6.1.0.19, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.Share.6.1.0.19-beta\lib\portable-net45+wp80+win8+wpa81\Plugin.Share.dll</HintPath>
<Reference Include="Plugin.Share, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.Share.7.0.1\lib\netstandard1.0\Plugin.Share.dll</HintPath>
</Reference>
<Reference Include="Plugin.Share.Abstractions, Version=6.1.0.19, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.Share.6.1.0.19-beta\lib\portable-net45+wp80+win8+wpa81\Plugin.Share.Abstractions.dll</HintPath>
<Reference Include="Plugin.Share.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.Share.7.0.1\lib\netstandard1.0\Plugin.Share.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
Expand All @@ -144,13 +141,13 @@
<HintPath>..\packages\Microsoft.Bcl.Compression.3.9.85\lib\portable-net45+win8+wp8+wpa81\System.IO.Compression.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.2.5.0.91635\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.2.5.0.91635\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.2.5.0.91635\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -193,7 +190,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
<Error Condition="!Exists('..\packages\Xamarin.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Import Project="..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
Expand All @@ -217,5 +214,5 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<Import Project="..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" />
</Project>
24 changes: 10 additions & 14 deletions Hanselman.Portable/Views/AboutPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,24 @@
x:Class="Hanselman.Portable.Views.AboutPage"
Title="Scott Hanselman">
<ScrollView>
<StackLayout Orientation="Vertical" Spacing="10">
<Image Aspect="AspectFill" Source="scott.png"/>
<StackLayout Spacing="10"
Padding="10"
VerticalOptions="FillAndExpand">
<StackLayout Orientation="Vertical" Spacing="10" Padding="10">
<Image Aspect="AspectFill" Source="scott.png" Margin="-10,0"/>


<Label
<Label Margin="0,50"
Text="My name is Scott Hanselman. I'm a programmer, teacher, and speaker. I work out of my home office in Portland, Oregon for the Web Platform Team at Microsoft, but this blog, its content and opinions are my own. I blog about technology, culture, gadgets, diversity, code, the web, where we're going and where we've been. I'm excited about community, social equity, media, entrepreneurship and above all, the open web."
LineBreakMode="WordWrap"/>

<StackLayout Orientation="Horizontal"
<StackLayout Orientation="Horizontal"
HorizontalOptions="CenterAndExpand"
Spacing="10">

<Image x:Name="twitter" Source="twitter.png"/>
<Image x:Name="facebook" Source="facebook.png"/>
<Image x:Name="instagram" Source="instagram.png"/>
<Image x:Name="twitter" Source="twitter.png"/>
<Image x:Name="facebook" Source="facebook.png"/>
<Image x:Name="instagram" Source="instagram.png"/>
</StackLayout>

</StackLayout>

</StackLayout>

</StackLayout>

</ScrollView>
</ContentPage>
2 changes: 1 addition & 1 deletion Hanselman.Portable/Views/MenuPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public MenuPage(RootPage root)
if(ListViewMenu.SelectedItem == null)
return;
await this.root.NavigateAsync(((HomeMenuItem)e.SelectedItem).MenuType);
await this.root.NavigateAsync((int)((HomeMenuItem)e.SelectedItem).MenuType);
};
}
}
Expand Down
29 changes: 15 additions & 14 deletions Hanselman.Portable/Views/RootPage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,29 @@ namespace Hanselman.Portable.Views
public class RootPage : MasterDetailPage
{
public static bool IsUWPDesktop { get; set; }
Dictionary<MenuType, NavigationPage> Pages { get; set;}
Dictionary<int, NavigationPage> Pages { get; set;}
public RootPage()
{
if(IsUWPDesktop)
this.MasterBehavior = MasterBehavior.Popover;

Pages = new Dictionary<MenuType, NavigationPage>();
Pages = new Dictionary<int, NavigationPage>();
Master = new MenuPage(this);
BindingContext = new BaseViewModel
{
Title = "Hanselman",
Icon = "slideout.png"
};
//setup home page
NavigateAsync(MenuType.About);
Pages.Add((int)MenuType.About, new HanselmanNavigationPage(new AboutPage()));
Detail = Pages[(int)MenuType.About];

InvalidateMeasure();
}



public async Task NavigateAsync(MenuType id)
public async Task NavigateAsync(int id)
{

if (Detail != null)
Expand All @@ -48,25 +49,25 @@ public async Task NavigateAsync(MenuType id)

switch (id)
{
case MenuType.About:
case (int)MenuType.About:
Pages.Add(id, new HanselmanNavigationPage(new AboutPage()));
break;
case MenuType.Blog:
case (int)MenuType.Blog:
Pages.Add(id, new HanselmanNavigationPage(new BlogPage()));
break;
case MenuType.DeveloperLife:
Pages.Add(id, new HanselmanNavigationPage(new PodcastPage(id)));
case (int)MenuType.DeveloperLife:
Pages.Add(id, new HanselmanNavigationPage(new PodcastPage((MenuType)id)));
break;
case MenuType.Hanselminutes:
Pages.Add(id, new HanselmanNavigationPage(new PodcastPage(id)));
case (int)MenuType.Hanselminutes:
Pages.Add(id, new HanselmanNavigationPage(new PodcastPage((MenuType)id)));
break;
case MenuType.Ratchet:
Pages.Add(id, new HanselmanNavigationPage(new PodcastPage(id)));
case (int)MenuType.Ratchet:
Pages.Add(id, new HanselmanNavigationPage(new PodcastPage((MenuType)id)));
break;
case MenuType.Twitter:
case (int)MenuType.Twitter:
Pages.Add(id, new HanselmanNavigationPage(new TwitterPage()));
break;
case MenuType.Videos:
case (int)MenuType.Videos:
Pages.Add(id, new HanselmanNavigationPage(new Channel9VideosPage()));
break;
}
Expand Down
Loading

0 comments on commit d39e6b6

Please sign in to comment.