Skip to content
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

Jump to bottom

Migrate to AndroidX #4

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

Migrate to AndroidX #4

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
e2d3355
Update nuget packages
KennyDizi Apr 2, 2020
f3ca945
Change targetSdkVersion
KennyDizi Apr 2, 2020
3b7111d
Change TargetFrameworkVersion to v10
KennyDizi Apr 2, 2020
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 src/ElegantTabs/ElegantTabs/ElegantTabs.Abstraction/ElegantTabs.Abstraction.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.482894" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.530" />
</ItemGroup>

</Project>
10 changes: 4 additions & 6 deletions src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using Xamarin.Forms.Platform.Android.AppCompat;
using Android.Support.Design.Widget;
using Android.Views;
using Android.Widget;
using Xamarin.Forms.Platform.Android;
Expand All @@ -10,9 +9,8 @@
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using View = Android.Views.View;
using System.Linq;
using Android.Support.Design.Internal;
using Xamarin.Forms;
using Android.Support.Design.BottomNavigation;
using Google.Android.Material.BottomNavigation;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/xamarin/Xamarin.Forms/blob/7a52542d50797ccc69ae1d8dd84259190d96bdb4/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs#L10
Use compiler directive approach for providing support for previous versions too
eg. #if ANDROID_29


namespace ElegantTabs.Droid
{
Expand Down Expand Up @@ -70,7 +68,7 @@ private void UpdateIcons(int selectedIndex)
var icon = Transforms.GetSelectedIcon(page);
if (string.IsNullOrWhiteSpace(icon))
{
menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.Icon, ResourceManager.DrawableClass));
menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.IconImageSource, ResourceManager.DrawableClass));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why you did this change. If IconImageSource is already set, it will be taken, then page.Icon.

}
else
{
Expand All @@ -79,12 +77,12 @@ private void UpdateIcons(int selectedIndex)
}
else
{
menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.Icon, ResourceManager.DrawableClass));
menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.IconImageSource, ResourceManager.DrawableClass));
}
}
else
{
menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.Icon, ResourceManager.DrawableClass));
menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.IconImageSource, ResourceManager.DrawableClass));
}
}
UpdateTabs();
Expand Down
25 changes: 15 additions & 10 deletions src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabs.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -15,8 +15,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand All @@ -30,9 +29,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -52,13 +48,22 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design">
<Version>28.0.0.1</Version>
<PackageReference Include="Xamarin.Google.Android.Material">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>4.0.0.482894</Version>
<Version>4.5.0.530</Version>
</PackageReference>
</ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.2" /> <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Browser">
<Version>1.2.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
<Version>1.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="ElegantTabRenderer.cs" />
<Compile Include="Extension.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/ElegantTabs/ElegantTabs/ElegantTabs.Android/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:versionCode="1" android:versionName="1.0" package="com.companyname.ElegantTabs.Android">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:label="ElegantTabs.Android"></application>
</manifest>
6 changes: 0 additions & 6 deletions src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Threading.Tasks;
using UIKit;
using Xamarin.Forms.Internals;
using static Xamarin.Forms.PlatformConfiguration.iOSSpecific.Page;
using PageUIStatusBarAnimation = Xamarin.Forms.PlatformConfiguration.iOSSpecific.UIStatusBarAnimation;
using ElegantTabs.Abstraction;
using Xamarin.Forms.Platform.iOS;
using System.Linq;
using Xamarin.Forms;

namespace ElegantTabs.iOS
Expand Down
28 changes: 9 additions & 19 deletions src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabs.iOS.csproj
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"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.props')" />
<Import Project="..\..\packages\Xamarin.Forms.4.5.0.530\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.5.0.530\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -38,19 +38,16 @@
<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.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<Reference Include="Xamarin.iOS" />
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.4.5.0.530\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\packages\Xamarin.Forms.4.5.0.530\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.4.5.0.530\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
Expand All @@ -69,12 +66,5 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.targets'))" />
</Target>
<Import Project="..\..\packages\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.0.0.482894\build\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.4.5.0.530\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.5.0.530\build\Xamarin.Forms.targets')" />
</Project>
2 changes: 1 addition & 1 deletion src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xamarin.Forms" version="4.0.0.482894" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="4.5.0.530" targetFramework="xamarinios10" />
</packages>