Skip to content

Updated all dependencies #157

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
ddobrev wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updated all dependencies #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb2e821
Upgraded Xamarin.Forms to version 3.0.
ddobrev May 11, 2018
3827ce6
Migrated all projects from packages.config to package references.
ddobrev May 11, 2018
725e45d
Updated the packages for the Xamarin.Android bindings.
ddobrev May 11, 2018
19bcdb1
Removed the target SDK version for Android to fix a warning.
ddobrev May 11, 2018
01f950b
Removed all usages of deprecated code.
ddobrev May 11, 2018
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
2 changes: 1 addition & 1 deletion Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/MyTheme" package="com.toasts.plugin" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
<uses-sdk android:minSdkVersion="16" />
<application android:label="Toasts.Forms.Plugin.Sample.DroidAppCompat"></application>
</manifest>
5,721 changes: 3,301 additions & 2,420 deletions Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/Resources/Resource.Designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

157 changes: 52 additions & 105 deletions ...oasts.Forms.Plugin.Sample.DroidAppCompat/Toasts.Forms.Plugin.Sample.DroidAppCompat.csproj
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 0 additions & 20 deletions Sample/Toasts.Forms.Plugin.Sample.DroidAppCompat/packages.config
View file
Open in desktop

This file was deleted.

23 changes: 5 additions & 18 deletions Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.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.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
Expand Down Expand Up @@ -29,7 +28,6 @@
<MtouchArch>Default, i386, x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>True</MtouchDebug>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchSdkVersion>
</MtouchSdkVersion>
<MtouchProfiling>False</MtouchProfiling>
Expand Down Expand Up @@ -110,7 +108,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork@2x" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Toasts.Forms.Plugin.Abstractions\Toasts.Forms.Plugin.Abstractions.csproj">
Expand Down Expand Up @@ -150,32 +147,22 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.2.5.0.91635\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.2.5.0.91635\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.2.5.0.91635\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.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\icon.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>3.0.0.446417</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets'))" />
</Target>
<Import Project="..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets')" />
</Project>
4 changes: 0 additions & 4 deletions Sample/Toasts.Forms.Plugin.Sample.iOS/packages.config
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Sample/Toasts.Forms.Plugin.Sample/Toasts.Forms.Plugin.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.0.91635" />
<PackageReference Include="Xamarin.Forms" Version="3.0.0.446417" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
2 changes: 1 addition & 1 deletion Toasts.Forms.Plugin.Abstractions/Toasts.Forms.Plugin.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
</Project>
5 changes: 3 additions & 2 deletions Toasts.Forms.Plugin.Droid/AlarmHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.IO;
using System.Xml.Serialization;
using Android.Graphics;
using Android.Support.V4.App;

namespace Plugin.Toasts
{
Expand All @@ -24,12 +25,12 @@ public override void OnReceive(Context context, Intent intent)
}

// Show Notification
Android.App.Notification.Builder builder = new Android.App.Notification.Builder(Application.Context)
var builder = new NotificationCompat.Builder(Application.Context, NotificationBuilder.DefaultChannelName)
.SetContentTitle(options.Title)
.SetContentText(options.Description)
.SetSmallIcon(options.AndroidOptions.SmallDrawableIcon.Value) // Must have small icon to display
.SetPriority((int)NotificationPriority.High) // Must be set to High to get Heads-up notification
.SetDefaults(NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
.SetDefaults((int) NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
.SetAutoCancel(true)
.SetColor(Color.ParseColor(options.AndroidOptions.HexColor));

Expand Down
5 changes: 3 additions & 2 deletions Toasts.Forms.Plugin.Droid/NotificationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Xml.Serialization;
using Plugin.Toasts.Interfaces;
using System.Collections.Concurrent;
using Android.Support.V4.App;

namespace Plugin.Toasts
{
Expand Down Expand Up @@ -211,12 +212,12 @@ public INotificationResult Notify(Activity activity, INotificationOptions option
options.AndroidOptions.HexColor = "#" + options.AndroidOptions.HexColor;
}

Android.App.Notification.Builder builder = new Android.App.Notification.Builder(Application.Context)
var builder = new NotificationCompat.Builder(Application.Context, DefaultChannelName)
.SetContentTitle(options.Title)
.SetContentText(options.Description)
.SetSmallIcon(smallIcon) // Must have small icon to display
.SetPriority((int)NotificationPriority.High) // Must be set to High to get Heads-up notification
.SetDefaults(NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
.SetDefaults((int) NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
.SetAutoCancel(true) // To allow click event to trigger delete Intent
.SetContentIntent(pendingClickIntent) // Must have Intent to accept the click
.SetDeleteIntent(pendingDismissIntent)
Expand Down
Loading