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

Improves Samples #447

Merged
merged 8 commits into from
Mar 9, 2021
Merged

Improves Samples #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
469f967
Move towards resizetization
mattleibow Mar 6, 2021
0cde090
Fix the build tasks
mattleibow Mar 6, 2021
42cc335
icons all over
mattleibow Mar 6, 2021
1aa1534
Add mac catalyst to the sln
mattleibow Mar 6, 2021
5eeea82
make sdk style
mattleibow Mar 7, 2021
350ccb8
catalyst is ios on windows
mattleibow Mar 7, 2021
4b078d6
conflicts
mattleibow Mar 7, 2021
1562d4d
Merge branch 'main' into dev/resizetize-everything
jsuarezruiz Mar 8, 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

.nuspec/**/*.dll
.nuspec/**/*.dylib
.nuspec/**/*.so
.XamarinFormsVersionFile.txt

# User-specific files
Expand Down
2 changes: 1 addition & 1 deletion .nuspec/package.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ param ($configuration)
dotnet pack $PSScriptRoot\..\Microsoft.Maui-net6.sln `
-c:$configuration `
-p:SymbolPackageFormat=snupkg `
-bl:$PSScriptRoot\..\artifacts\maui.binlog
-bl:$PSScriptRoot/../artifacts/maui.binlog
7 changes: 7 additions & 0 deletions Microsoft.Maui-net6.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Droid-
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.iOS-net6", "src\Controls\samples\Controls.Sample.iOS\Maui.Controls.Sample.iOS-net6.csproj", "{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.MacCatalyst-net6", "src\Controls\samples\Controls.Sample.MacCatalyst\Maui.Controls.Sample.MacCatalyst-net6.csproj", "{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.SingleProject", "src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj", "{CB495F62-CFE6-4975-AED8-F26B6C5D0113}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{123AA89E-1638-4E0E-B828-B8F9F9F906A2}"
Expand Down Expand Up @@ -83,6 +85,10 @@ Global
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.Build.0 = Release|Any CPU
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Release|Any CPU.Build.0 = Release|Any CPU
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -124,6 +130,7 @@ Global
{B8DC1324-977C-46F1-B697-9064ADE6099A} = {E1082E26-D700-4127-9329-66D673FD2D55}
{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18} = {E1082E26-D700-4127-9329-66D673FD2D55}
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE} = {E1082E26-D700-4127-9329-66D673FD2D55}
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6} = {E1082E26-D700-4127-9329-66D673FD2D55}
{CB495F62-CFE6-4975-AED8-F26B6C5D0113} = {E1082E26-D700-4127-9329-66D673FD2D55}
{75C380E0-CE53-4C01-B89F-CF685331DE18} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
{39B47A3C-21CA-4B28-9250-14FD957EB0FC} = {94F3C036-A5F4-4ACC-A028-8506802ADB88}
Expand Down
16 changes: 4 additions & 12 deletions ...tibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup-net6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-android</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Controls.Android</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.Android.FormsViewGroup</AssemblyName>
<RootNamespace>Microsoft.Maui.Controls.Compatibility.Android</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup</AssemblyName>
<OutputType>Library</OutputType>
<Nullable>disable</Nullable>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedJar Include="Jars\formsviewgroup.jar" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\Metadata.xml" />
<EmbeddedJar Include="Jars\*.jar" />
<TransformFile Include="Transforms\*.xml" />
</ItemGroup>
</Project>

63 changes: 8 additions & 55 deletions ...Compatibility/Core/src/Android.FormsViewGroup/Compatibility.Android.FormsViewGroup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(AndroidTargetFrameworks)</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Controls.Compatibility.Android</RootNamespace>
<AssemblyName>Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup</AssemblyName>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<RootNamespace>Microsoft.Maui.Controls.Android</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<AndroidClassParser>class-parse</AndroidClassParser>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{3B72465B-ACAE-43AE-9327-10F372FE5F80}</ProjectGuid>
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FormsViewGroup</RootNamespace>
<AssemblyName>FormsViewGroup</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>CS0109</NoWarn>
<IsBindingProject>true</IsBindingProject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>CS0109</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedJar Include="Jars\formsviewgroup.jar" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\Metadata.xml" />
<EmbeddedJar Include="Jars\*.jar" />
<TransformFile Include="Transforms\*.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
6 changes: 0 additions & 6 deletions src/Compatibility/Core/src/Android.FormsViewGroup/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Compatibility/Core/src/Android.FormsViewGroup/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-->

<attr path="/api/package[@name='com.xamarin.forms.platform.android']" name="managedName">Microsoft.Maui.Controls.Android</attr>
<attr path="/api/package[@name='com.xamarin.formsviewgroup']" name="managedName">Microsoft.Maui.Controls.Android</attr>
<attr path="/api/package[@name='com.xamarin.forms.platform.android']" name="managedName">Microsoft.Maui.Controls.Compatibility</attr>
<attr path="/api/package[@name='com.xamarin.formsviewgroup']" name="managedName">Microsoft.Maui.Controls.Compatibility</attr>
</metadata>
1 change: 0 additions & 1 deletion src/Compatibility/Core/src/Android/VisualElementRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using AndroidX.Core.View;
using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
using AView = Android.Views.View;
using Microsoft.Maui.Controls.Android;
using Microsoft.Maui.Controls.Internals;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
Expand Down
6 changes: 3 additions & 3 deletions src/Compatibility/Core/src/Android/VisualElementTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void UpdateLayout()
var width = Math.Max(0, (int)_context.ToPixels(view.Width));
var height = Math.Max(0, (int)_context.ToPixels(view.Height));

var formsViewGroup = aview as Controls.Android.FormsViewGroup;
var formsViewGroup = aview as FormsViewGroup;
if (formsViewGroup == null)
{
Performance.Start(reference, "Measure");
Expand Down Expand Up @@ -348,7 +348,7 @@ void UpdateNativeView(object sender, EventArgs e)
VisualElement view = _renderer.Element;
AView aview = _renderer.View;

if (aview is Controls.Android.FormsViewGroup formsViewGroup)
if (aview is FormsViewGroup formsViewGroup)
{
formsViewGroup.SendBatchUpdate((float)(view.AnchorX * _context.ToPixels(view.Width)),
(float)(view.AnchorY * _context.ToPixels(view.Height)),
Expand All @@ -365,7 +365,7 @@ void UpdateNativeView(object sender, EventArgs e)
}
else
{
Controls.Android.FormsViewGroup.SendViewBatchUpdate(aview,
FormsViewGroup.SendViewBatchUpdate(aview,
(float)(view.AnchorX * _context.ToPixels(view.Width)),
(float)(view.AnchorY * _context.ToPixels(view.Height)),
(int)(view.IsVisible ? ViewStates.Visible : ViewStates.Invisible),
Expand Down
19 changes: 0 additions & 19 deletions src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,34 +68,15 @@
<ItemGroup>
<Compile Include="MainActivity.cs" />
<Compile Include="MainApplication.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
<AndroidResource Include="Resources\values\dimens.xml" />
<AndroidResource Include="Resources\values\ic_launcher_background.xml" />
<AndroidResource Include="Resources\values\strings.xml" />
<AndroidResource Include="Resources\values\styles.xml" />
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
<AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
Expand Down
7 changes: 4 additions & 3 deletions src/Controls/samples/Controls.Sample.Droid/Maui.Controls.Sample.Droid-net6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-android</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>Maui.Controls.Sample.Droid</RootNamespace>
<AssemblyName>Maui.Controls.Sample.Droid</AssemblyName>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Core\src\Core-net6.csproj" />
<ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility-net6.csproj" />
<ProjectReference Include="..\Controls.Sample\Maui.Controls.Sample-net6.csproj" />
<PackageReference Include="Xamarin.AndroidX.Browser" />
</ItemGroup>

<!--
The linker resolves some assembly references too eagerly, and
fails when it can't find them, so work around this by referencing
Expand All @@ -32,4 +32,5 @@
<PackageReference Include="System.Security.Permissions" Version="$(_DotNetPackageVersion)" />
<PackageReference Include="System.Threading.AccessControl" Version="$(_DotNetPackageVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Controls/samples/Controls.Sample.Droid/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:versionCode="1" android:versionName="1.0" package="com.microsoft.maui">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:label="@string/app_name" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
13 changes: 0 additions & 13 deletions src/Controls/samples/Controls.Sample.Droid/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Controls/samples/Controls.Sample.Droid/Resources/mipmap-anydpi-v26/ic_launcher.xml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Controls/samples/Controls.Sample.Droid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
View file
Open in desktop

This file was deleted.

Binary file removed src/Controls/samples/Controls.Sample.Droid/Resources/mipmap-hdpi/ic_launcher.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../samples/Controls.Sample.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...trols/samples/Controls.Sample.Droid/Resources/mipmap-hdpi/ic_launcher_round.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/Controls/samples/Controls.Sample.Droid/Resources/mipmap-mdpi/ic_launcher.png
View file
Open in desktop
Binary file not shown.
Binary file removed .../samples/Controls.Sample.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...trols/samples/Controls.Sample.Droid/Resources/mipmap-mdpi/ic_launcher_round.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/Controls/samples/Controls.Sample.Droid/Resources/mipmap-xhdpi/ic_launcher.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...samples/Controls.Sample.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...rols/samples/Controls.Sample.Droid/Resources/mipmap-xhdpi/ic_launcher_round.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/Controls/samples/Controls.Sample.Droid/Resources/mipmap-xxhdpi/ic_launcher.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...amples/Controls.Sample.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ols/samples/Controls.Sample.Droid/Resources/mipmap-xxhdpi/ic_launcher_round.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...Controls/samples/Controls.Sample.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...mples/Controls.Sample.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...ls/samples/Controls.Sample.Droid/Resources/mipmap-xxxhdpi/ic_launcher_round.png
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions src/Controls/samples/Controls.Sample.Droid/Resources/values/ic_launcher_background.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Controls/samples/Controls.Sample.Droid/Resources/values/strings.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"?>
<resources>
<string name="app_name">Maui</string>
<string name="app_name">Controls</string>
<string name="action_settings">Settings</string>
</resources>
Loading