Skip to content

Commit a9846c1

Browse files
xabrexabre
committed
#87 Upgraded a ndroid target version to 10. Updated XF to 4.5 stable and AndroidX
1 parent f60b978 commit a9846c1

File tree

18 files changed

+28
-43
lines changed

18 files changed

+28
-43
lines changed

‎Source/Plugin.Badge.Abstractions/Plugin.Badge.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Folder Include="Properties\" />
77
</ItemGroup>
88
<ItemGroup>
9-
<PackageReference Include="Xamarin.Forms" Version="4.0.0.425677" />
9+
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
1010
</ItemGroup>
1111

1212
</Project>

‎Source/Plugin.Badge.Droid/BadgeView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Android.Views.Animations;
88
using Android.Widget;
99
using Android.Graphics.Drawables.Shapes;
10-
using Android.Support.V4.View;
10+
using AndroidX.Core.View;
1111
using Plugin.Badge.Abstractions;
1212

1313
namespace Plugin.Badge.Droid

‎Source/Plugin.Badge.Droid/BadgedTabbedPageRenderer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Threading.Tasks;
44
using Xamarin.Forms.Platform.Android.AppCompat;
55
using Xamarin.Forms;
6-
using Android.Support.Design.Widget;
76
using Android.Views;
87
using Android.Widget;
98
using Xamarin.Forms.Platform.Android;
@@ -12,6 +11,8 @@
1211
using TabbedPage = Xamarin.Forms.TabbedPage;
1312
using Plugin.Badge.Abstractions;
1413
using System.Linq;
14+
using Google.Android.Material.BottomNavigation;
15+
using Google.Android.Material.Tabs;
1516

1617
namespace Plugin.Badge.Droid
1718
{

‎Source/Plugin.Badge.Droid/Plugin.Badge.Droid.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<RootNamespace>Plugin.Badge.Droid</RootNamespace>
1010
<AssemblyName>Plugin.Badge.Droid</AssemblyName>
11-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
1212
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1313
<AndroidResgenClass>Resource</AndroidResgenClass>
1414
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -65,7 +65,7 @@
6565
</ItemGroup>
6666
<ItemGroup>
6767
<PackageReference Include="Xamarin.Forms">
68-
<Version>4.0.0.425677</Version>
68+
<Version>4.5.0.356</Version>
6969
</PackageReference>
7070
</ItemGroup>
7171
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

‎Source/Plugin.Badge.Mac/Plugin.Badge.Mac.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</ItemGroup>
7373
<ItemGroup>
7474
<PackageReference Include="Xamarin.Forms">
75-
<Version>4.0.0.425677</Version>
75+
<Version>4.5.0.356</Version>
7676
</PackageReference>
7777
</ItemGroup>
7878
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />

‎Source/Plugin.Badge.Sample.Droid.Legacy/Plugin.Badge.Sample.Droid.Legacy.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1717
<AndroidResgenClass>Resource</AndroidResgenClass>
1818
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
19-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
2020
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2121
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
2222
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
@@ -112,7 +112,7 @@
112112
</ItemGroup>
113113
<ItemGroup>
114114
<PackageReference Include="Xamarin.Forms">
115-
<Version>4.0.0.425677</Version>
115+
<Version>4.5.0.356</Version>
116116
</PackageReference>
117117
</ItemGroup>
118118
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

‎Source/Plugin.Badge.Sample.Droid.Legacy/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Plugin.Badge.Sample.Droid.Legacy.Plugin.Badge.Sample.Droid.Legacy" android:versionCode="1" android:versionName="1.0">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
44
<application android:allowBackup="true" android:label="@string/app_name"></application>
55
</manifest>

‎Source/Plugin.Badge.UWP/Plugin.Badge.UWP.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Plugin.Badge.UWP</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -145,7 +145,7 @@
145145
</ItemGroup>
146146
<ItemGroup>
147147
<PackageReference Include="Xamarin.Forms">
148-
<Version>4.0.0.425677</Version>
148+
<Version>4.5.0.356</Version>
149149
</PackageReference>
150150
</ItemGroup>
151151
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

‎Source/Plugin.Badge.WPF/Plugin.Badge.WPF.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
</ItemGroup>
9999
<ItemGroup>
100100
<PackageReference Include="Xamarin.Forms">
101-
<Version>4.0.0.425677</Version>
101+
<Version>4.5.0.356</Version>
102102
</PackageReference>
103103
<PackageReference Include="Xamarin.Forms.Platform.WPF">
104-
<Version>4.0.0.425677</Version>
104+
<Version>4.5.0.356</Version>
105105
</PackageReference>
106106
</ItemGroup>
107107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Source/Plugin.Badge.WPF/TabItemTemplate.xaml.cs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Threading.Tasks;
1+
using System.ComponentModel;
72
using System.Windows;
8-
using System.Windows.Controls;
9-
using System.Windows.Data;
10-
using System.Windows.Documents;
11-
using System.Windows.Input;
12-
using System.Windows.Media;
13-
using System.Windows.Media.Imaging;
14-
using System.Windows.Navigation;
15-
using System.Windows.Shapes;
163
using Plugin.Badge.Abstractions;
17-
using Xamarin.Forms;
184
using Page = Xamarin.Forms.Page;
195

206
namespace Plugin.Badge.WPF
@@ -50,7 +36,7 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA
5036
if (this.DataContext is Page page)
5137
{
5238
_tab = page.GetPageWithBadge();
53-
_tab.PropertyChanged -= BindableObjectOnPropertyChanged;
39+
_tab.PropertyChanged += BindableObjectOnPropertyChanged;
5440
}
5541
}
5642

0 commit comments

Comments
 (0)