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.

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

[dualscreen] project/nuget for Surface Duo and other Android foldables #5020

Merged
merged 89 commits into from
Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
1ca4e72
initial commit
conceptdev Oct 13, 2021
0da9e49
seems to build?
conceptdev Oct 13, 2021
1b266d2
Merge pull request #1 from conceptdev/dual-screen-foldable-init
conceptdev Oct 13, 2021
aaea54c
add page to sample
conceptdev Oct 14, 2021
d49b3d4
sample screen tweaks
conceptdev Oct 14, 2021
f69cf8f
trying to wire up the hinge angle
conceptdev Oct 14, 2021
a8cff4f
correct port of visualElement
conceptdev Oct 14, 2021
8e00432
- fix up measure calls
PureWeen Oct 14, 2021
a2249d2
correct configChanges in Android sample
conceptdev Oct 14, 2021
787cceb
- remeasure if mode changed
PureWeen Oct 14, 2021
2241121
add AndroidX.Window.WindowJava with log output
conceptdev Oct 14, 2021
ca7d29e
kinda measuring but not really
conceptdev Oct 15, 2021
c8aae8d
- hostbuilder extension
PureWeen Oct 15, 2021
9995fcc
- include file
PureWeen Oct 15, 2021
ea70759
basic hostbuilder test
conceptdev Oct 15, 2021
b9e0b40
most debug lines to figure out why it's not working
conceptdev Oct 18, 2021
b91e1a1
kinda works except on first span :|
conceptdev Oct 19, 2021
68e1405
add testing features on TwoPaneViewPage
conceptdev Oct 19, 2021
03eed44
remove un-used UpdateMetrics interface method
conceptdev Oct 19, 2021
4119a7e
remove commented FoldEventArgs
conceptdev Oct 19, 2021
1cd0f1c
remove un-used UpdateMetrics interface method
conceptdev Oct 19, 2021
decfcec
deleting code
conceptdev Oct 19, 2021
a7888ff
- remove extra code
PureWeen Oct 20, 2021
7cfcaf2
Merge branch 'main' into dual-screen-foldable
conceptdev Oct 21, 2021
1f50837
Merge branch 'dotnet:main' into dual-screen-foldable
conceptdev Dec 7, 2021
d736704
[dualscreen] rebase
conceptdev Dec 7, 2021
f31d655
wire up hostbuilder
conceptdev Dec 13, 2021
8503a6c
Merge branch 'main' of https://github.com/dotnet/maui into dotnet-main
conceptdev Dec 17, 2021
76cdc0f
Merge pull request #3 from conceptdev/dotnet-main
conceptdev Dec 17, 2021
f43917e
[dualscreen] progress check-in - work not complete
conceptdev Dec 21, 2021
dfa63a0
update fixes
conceptdev Feb 2, 2022
5b7cf17
Merge branch 'main' into dual-screen-foldable
conceptdev Feb 2, 2022
88531d7
[dualscreen] wire up twopaneview properties
conceptdev Feb 4, 2022
99a915e
[dualscreen] Jetpack Window Manager 1.0 stable
conceptdev Feb 24, 2022
86661bf
[dualscreen] add test properties to XAML
conceptdev Feb 24, 2022
9449e4d
[dualscreen] remove MainActivity hardcoding, use HostBuilderExtension
conceptdev Feb 25, 2022
f7ae4a0
[dualscreen] fix hinge sensor
conceptdev Feb 25, 2022
5fe7318
[dualscreen] tweak activity context
conceptdev Feb 26, 2022
ad8cf33
[dualscreen] correct for Samsung Galaxy Fold
conceptdev Mar 2, 2022
64ec2d2
[dualscreen] refactor project name (remove -net6)
conceptdev Mar 2, 2022
efa591d
[dualscreen] remove prototyping code from sample project
conceptdev Mar 2, 2022
7a81feb
[dualscreen] add comments
conceptdev Mar 8, 2022
a3e34f9
[dualscreen] fix bug: hinge not recognized when spanned on open
conceptdev Mar 9, 2022
f3bc256
[dualscreen] address some of the PR feedback
conceptdev Mar 9, 2022
e7b5e1b
Merge branch 'main' into dual-screen-foldable
conceptdev Mar 9, 2022
f6fc703
[dualscreen] rebase fixes
conceptdev Mar 10, 2022
e05f1a7
[foldable] namespace refactor from DualScreen to Foldable
conceptdev Mar 11, 2022
cf21055
[foldable] refactor project name from DualScreen to Foldable
conceptdev Mar 11, 2022
4062129
[foldable] refactor DualScreenService -> FoldableService
conceptdev Mar 11, 2022
aa9d9e0
[foldable] refactor filenames DualScreenService -> FoldableService
conceptdev Mar 11, 2022
86d978d
[foldable] address PR feedback
conceptdev Mar 11, 2022
00df2eb
Merge branch 'main' into dual-screen-foldable
conceptdev Mar 11, 2022
4678192
Merge branch 'main' into dual-screen-foldable
conceptdev Mar 15, 2022
d349547
- workloads
PureWeen Mar 15, 2022
b305292
- cleanup
PureWeen Mar 15, 2022
8e4a7fd
- delete commented out code
PureWeen Mar 15, 2022
6eb943c
[foldable] remove debug log and commented-out code
conceptdev Mar 15, 2022
65ac724
[foldable] rename project folder
conceptdev Mar 16, 2022
e08581f
[foldable] remove commented code (PR feedback)
conceptdev Mar 16, 2022
f9600c7
Merge branch 'main' into dual-screen-foldable
PureWeen Mar 16, 2022
1e7574c
- organize the code a bit and switch to using services
PureWeen Mar 16, 2022
1a3f8ba
- fix dualscreen service to pull correctly
PureWeen Mar 16, 2022
b7bde39
- cleanup
PureWeen Mar 16, 2022
cd50b70
- fix update calls
PureWeen Mar 16, 2022
868c6f6
- fix some measures
PureWeen Mar 16, 2022
fb1a1fc
- add some additional checks
PureWeen Mar 16, 2022
7850168
- remove screen check
PureWeen Mar 16, 2022
7232b87
- fix height passed in for mode updates
PureWeen Mar 16, 2022
eb7b705
- remove watch for changes
PureWeen Mar 16, 2022
2f1191f
- remove code that checks
PureWeen Mar 16, 2022
5ac04e0
- fix workloads
PureWeen Mar 17, 2022
00251f6
- workloads
PureWeen Mar 17, 2022
2c50edf
- fix paths
PureWeen Mar 17, 2022
458ab8e
- fix nuget.config
PureWeen Mar 17, 2022
f6e4d19
Update Microsoft.Maui.Controls.Foldable.Runtime.csproj
PureWeen Mar 17, 2022
a5ab524
Update Microsoft.Maui.Controls.Ref.csproj
PureWeen Mar 17, 2022
9a7307c
- change controls workloads back
PureWeen Mar 17, 2022
087ee6c
- remove from workloads
PureWeen Mar 17, 2022
0bb8453
- add foldable to build.tasks
PureWeen Mar 17, 2022
4f1d01e
Merge branch 'main' into dual-screen-foldable
PureWeen Mar 19, 2022
cc67a63
Merge branch 'main' into pr/5020
PureWeen Mar 21, 2022
d1aed10
Update Microsoft.Maui.Samples.slnf
PureWeen Mar 21, 2022
7b4ff32
Merge branch 'main' into pr/5020
PureWeen Mar 23, 2022
7ec307b
- leave foldables
PureWeen Mar 23, 2022
6fb0be5
Merge branch 'main' into dual-screen-foldable
PureWeen Mar 24, 2022
a1aa57c
Merge branch 'main' into dual-screen-foldable
conceptdev Mar 31, 2022
06d0596
Merge branch 'main' into dual-screen-foldable
conceptdev Apr 4, 2022
c73f978
[foldable] update namespaces after Essentials
conceptdev Apr 4, 2022
f388df1
[foldable] add Devices where Essentials was removed
conceptdev Apr 5, 2022
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
3 changes: 2 additions & 1 deletion Microsoft.Maui.Samples.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
"path": "Microsoft.Maui.sln",
"projects": [
"src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj",
"src\\Controls\\Foldable\\src\\Controls.Foldable.csproj",
"src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj",
"src\\Controls\\samples\\Controls.Sample.SingleProject\\Maui.Controls.Sample.SingleProject.csproj",
"src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj"
]
}
}
}
7 changes: 7 additions & 0 deletions Microsoft.Maui.sln
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.DeviceTests", "src
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Sandbox", "src\Controls\samples\Controls.Sample.Sandbox\Maui.Controls.Sample.Sandbox.csproj", "{532ACF23-381B-4F54-AEA9-25B5485F9148}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Foldable", "src\Controls\Foldable\src\Controls.Foldable.csproj", "{71FFE8BF-EBE4-4078-8484-86C6EA685D14}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A9C514B9-1EE2-4A12-8E8A-CE16D87545C3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiBlazorWebView.DeviceTests", "src\BlazorWebView\tests\MauiDeviceTests\MauiBlazorWebView.DeviceTests.csproj", "{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6}"
Expand Down Expand Up @@ -488,6 +490,10 @@ Global
{532ACF23-381B-4F54-AEA9-25B5485F9148}.Release|Any CPU.ActiveCfg = Release|Any CPU
{532ACF23-381B-4F54-AEA9-25B5485F9148}.Release|Any CPU.Build.0 = Release|Any CPU
{532ACF23-381B-4F54-AEA9-25B5485F9148}.Release|Any CPU.Deploy.0 = Release|Any CPU
{71FFE8BF-EBE4-4078-8484-86C6EA685D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{71FFE8BF-EBE4-4078-8484-86C6EA685D14}.Debug|Any CPU.Build.0 = Debug|Any CPU
{71FFE8BF-EBE4-4078-8484-86C6EA685D14}.Release|Any CPU.ActiveCfg = Release|Any CPU
{71FFE8BF-EBE4-4078-8484-86C6EA685D14}.Release|Any CPU.Build.0 = Release|Any CPU
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down Expand Up @@ -591,6 +597,7 @@ Global
{F28E8899-98D2-4915-8D48-D101D4837AB9} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
{C8B3C3B3-1CDA-41A2-BF20-A7FE33D6BB36} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
{532ACF23-381B-4F54-AEA9-25B5485F9148} = {E1082E26-D700-4127-9329-66D673FD2D55}
{71FFE8BF-EBE4-4078-8484-86C6EA685D14} = {50C758FE-4E10-409A-94F5-A75480960864}
{A9C514B9-1EE2-4A12-8E8A-CE16D87545C3} = {1614D1A4-5C3D-4D5B-8C89-426E37A564EF}
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6} = {A9C514B9-1EE2-4A12-8E8A-CE16D87545C3}
{4F2926C8-43AB-4328-A735-D9EAD699F81D} = {ED7F28E0-D0AF-417D-983D-3D874EEE8554}
Expand Down
4 changes: 4 additions & 0 deletions eng/AndroidX.targets
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,9 @@
Version="1.0.8"
NoWarn="NU1701"
/>
<PackageReference
Update="Xamarin.AndroidX.Window.WindowJava"
Version="1.0.0.7"
/>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion omnisharp.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"src/Controls/src/Xaml/Controls.Xaml.csproj",
"src/Controls/src/Xaml.Design/Controls.Xaml.Design.csproj",
"src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj",
"src/Controls/DualScreen/**",
"src/Controls/Foldable/**",
"src/Core/tests/Benchmarks/Core.Benchmarks.csproj",
"src/Templates/**",
"src/Workload/Microsoft.Maui.Controls.Ref/Microsoft.Maui.Controls.Ref.csproj",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Android.Content;
using Android.OS;
using Android.Runtime;
using Microsoft.Maui.Controls.DualScreen;
using Microsoft.Maui.Hosting;
using Plugin.CurrentActivity;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.VisualStateManagerGalleries.DualScreenStateTriggerGallery"
xmlns:dualScreen="clr-namespace:Microsoft.Maui.Controls.DualScreen;assembly=Microsoft.Maui.Controls.DualScreen"
xmlns:dualScreen="clr-namespace:Microsoft.Maui.Controls.Foldable;assembly=Microsoft.Maui.Controls.Foldable"
Title="DualScreenStateTrigger Gallery">
<ContentPage.Content>
<Grid>
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion src/Compatibility/Core/src/Android/Forms.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Maui.Controls.Compatibility.Platform.Android;
using Microsoft.Maui.Controls.DualScreen.Android;
using Microsoft.Maui.Controls.Internals;
using Microsoft.Maui.Graphics;
using AColor = Android.Graphics.Color;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
using Rectangle = Microsoft.Maui.Controls.Shapes.Rectangle;

// Views
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Maui.Controls.DualScreen")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Maui.Controls.Foldable")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests")]
6 changes: 0 additions & 6 deletions src/Controls/DualScreen/sample/Directory.Build.props

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading