Skip to content

Updated NuGet packages #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manojkulkarni30 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated NuGet packages #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7387b3
Updated Xamarin Forms NuGet Package To Latest Version
manojkulkarni30 Apr 13, 2021
1e101e4
Migrated To PackageReference
manojsunilkulkarni Apr 13, 2021
e456149
Fixed Toolbar Issue For Android
manojkulkarni30 Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/Xamarin.Netflix/Xamarin.Netflix.Android/MainActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
using Android.OS;
using Android.Views;
using Android.Widget;
using FFImageLoading.Forms.Droid;

using FFImageLoading.Forms.Platform;

using FormsToolkit;

using Xamarin.Netflix.ViewModels.Base;

namespace Xamarin.Netflix.Droid
Expand All @@ -24,14 +27,21 @@ protected override void OnCreate(Bundle bundle)

base.OnCreate(bundle);

CachedImageRenderer.Init();
CachedImageRenderer.Init(false);
Forms.Forms.Init(this, bundle);
LoadApplication(new App());

// Remove the logo when we're not on the main page.
MessagingService.Current.Subscribe<bool>(MessageKeys.ChangeToolbar, (page, showLogo) =>
{
var logo = FindViewById<ImageView>(Resource.Id.logoImageLayout);
var view = FindViewById<AndroidX.AppCompat.Widget.Toolbar>(Resource.Id.customtoolbar);
if (view == null)
return;

var logo = view.FindViewById<ImageView>(Resource.Id.logoImageLayout);

if (logo == null)
return;

if (showLogo)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Netflix/Xamarin.Netflix.Android/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.xamarin.netflix">
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="28" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:label="Netflix" android:icon="@drawable/icon"></application>
</manifest>
13 changes: 8 additions & 5 deletions src/Xamarin.Netflix/Xamarin.Netflix.Android/Renderers/CustomNavigationBarRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
using System.Reflection;
using Android.App;
using Android.App;
using Android.Util;
using Android.Views;

using System.Reflection;

using Xamarin.Forms;
using Xamarin.Forms.Platform.Android;
using Xamarin.Forms.Platform.Android.AppCompat;
using AToolbar = Android.Support.V7.Widget.Toolbar;
using AView = Android.Views.View;
using Xamarin.Netflix.Droid.Renderers;
using Android.Util;
using Xamarin.Netflix.Views;

using AToolbar = AndroidX.AppCompat.Widget.Toolbar;
using AView = Android.Views.View;

[assembly: ExportRenderer(typeof(TranspatentNavigationPage), typeof(CustomNavigationBarRenderer))]
namespace Xamarin.Netflix.Droid.Renderers
{
Expand Down
6 changes: 3 additions & 3 deletions src/Xamarin.Netflix/Xamarin.Netflix.Android/Resources/layout/ToolbarLogo.axml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/customtoolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
Expand All @@ -13,4 +13,4 @@
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/netflix" />
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
7 changes: 3 additions & 4 deletions src/Xamarin.Netflix/Xamarin.Netflix.Android/SplashActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
using Android.App;
using Android.Support.V7.App;

namespace Xamarin.Netflix.Droid
{
[Activity(
Label = "Netflix",
Icon = "@drawable/icon",
Theme = "@style/splashscreen",
MainLauncher = true,
Theme = "@style/splashscreen",
MainLauncher = true,
NoHistory = true)]
public class SplashActivity : AppCompatActivity
public class SplashActivity : AndroidX.AppCompat.App.AppCompatActivity
{
protected override void OnResume()
{
Expand Down
178 changes: 46 additions & 132 deletions src/Xamarin.Netflix/Xamarin.Netflix.Android/Xamarin.Netflix.Android.csproj
View file
Open in desktop

Large diffs are not rendered by default.

71 changes: 0 additions & 71 deletions src/Xamarin.Netflix/Xamarin.Netflix.Android/packages.config
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/Xamarin.Netflix/Xamarin.Netflix.iOS/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using FFImageLoading.Forms.Touch;
using FFImageLoading.Forms.Platform;

using Foundation;
using UIKit;

Expand Down
78 changes: 24 additions & 54 deletions src/Xamarin.Netflix/Xamarin.Netflix.iOS/Xamarin.Netflix.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
Expand Down Expand Up @@ -62,6 +61,7 @@
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<DebugType>none</DebugType>
Expand All @@ -75,6 +75,7 @@
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
<DebugType>none</DebugType>
Expand All @@ -87,6 +88,7 @@
<CodesignProvision>Automatic:AppStore</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<ItemGroup>
<Compile Include="Main.cs" />
Expand All @@ -98,7 +100,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork@2x" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Default-568h%402x.png" />
Expand All @@ -118,59 +119,16 @@
<BundleResource Include="Resources\Icon-Small%403x.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.4.8.1\lib\netstandard1.1\Autofac.dll</HintPath>
</Reference>
<Reference Include="DLToolkit.Forms.Controls.FlowListView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DLToolkit.Forms.Controls.FlowListView.2.0.11\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+netstandard1.0\DLToolkit.Forms.Controls.FlowListView.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading, Version=2.4.3.840, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.4.3.840\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.12-pre-497\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FFImageLoading.Forms.Touch, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.12-pre-497\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FFImageLoading.Platform, Version=2.4.3.840, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.4.3.840\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
</Reference>
<Reference Include="FormsToolkit, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\FormsToolkit.2.0.1\lib\Xamarin.iOS10\FormsToolkit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FormsToolkit.iOS, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\FormsToolkit.2.0.1\lib\Xamarin.iOS10\FormsToolkit.iOS.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="WebP.Touch, Version=1.0.6628.22311, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\WebP.Touch.1.0.8\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Netflix\Xamarin.Netflix.csproj">
<Project>{7048da86-7011-4a31-87dd-6f96a6de5af3}</Project>
<Project>{5CE614DA-DBF8-4E30-8638-A00B5F2BB088}</Project>
<Name>Xamarin.Netflix</Name>
</ProjectReference>
</ItemGroup>
Expand Down Expand Up @@ -293,13 +251,25 @@
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac">
<Version>6.1.0</Version>
</PackageReference>
<PackageReference Include="DLToolkit.Forms.Controls.FlowListView">
<Version>2.0.11</Version>
</PackageReference>
<PackageReference Include="FormsToolkit">
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="WebP.Touch">
<Version>1.0.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.FFImageLoading.Forms">
<Version>2.4.11.982</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2012</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.targets'))" />
</Target>
<Import Project="..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.3.1.0.697729\build\netstandard2.0\Xamarin.Forms.targets')" />
</Project>
Loading