microsoft
/
surface-duo-sdk-xamarin-samples
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update Xamarin.Android samples to Jetpack Window Manager beta02 (#22) 

* [windowmanager] update to beta02

* update to beta02

fixes #21
This commit is contained in:
Craig Dunn 2021-09-07 09:01:25 -07:00 коммит произвёл GitHub
Родитель 24765937d1
Коммит afd1a49ee8
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
13 изменённых файлов: 39 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
CompanionPane/CompanionPane.csproj
Просмотреть файл

@ -147,10 +147,10 @@
<Version>1.1.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

8
CompanionPane/MainActivity.cs
Просмотреть файл

@ -16,6 +16,7 @@ using System.Linq;
/*
23-Aug-21 Update to androidx.window-1.0.0-beta01
HACK: need to JavaCast IDisplayFeature to IFoldingFeature
01-Sep-21 Updated to AndroidX.Window-1.0.0-beta02
*/
namespace CompanionPane
{
@ -55,8 +56,7 @@ namespace CompanionPane
dualLandscape.RegisterOnItemSelectedListener(this);
wir = new WindowInfoRepositoryCallbackAdapter(WindowInfoRepository.Companion.GetOrCreate(this));
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
SetupLayout();
}
@ -110,13 +110,13 @@ namespace CompanionPane
protected override void OnStart()
{
base.OnStart();
wm.RegisterLayoutChangeCallback(runOnUiThreadExecutor(), this);
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
}
protected override void OnStop()
{
base.OnStop();
wm.UnregisterLayoutChangeCallback(this);
wir.RemoveWindowLayoutInfoListener(this);
}
void ShowFragment(Fragment fragment)

2
CompanionPane/Slide.cs
Просмотреть файл

@ -25,6 +25,6 @@ namespace CompanionPane
public static IEnumerable<Slide> Slides =>
Enumerable.Range(0, 9)
.Select(i => new Slide($"Slide {i + 1}", $"Slide Content {i + 1}"));
.Select(i => new Slide($"Slide {i + 1}", $"Slide content {i + 1}"));
}
}

4
DualView/DualView.csproj
Просмотреть файл

@ -127,10 +127,10 @@
<Version>2.0.4.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

5
DualView/MainActivity.cs
Просмотреть файл

@ -15,6 +15,7 @@ using Android.Util;
/*
23-Aug-21 Update to androidx.window-1.0.0-beta01
HACK: need to JavaCast IDisplayFeature to IFoldingFeature
01-Sep-21 Updated to AndroidX.Window-1.0.0-beta02
*/
namespace DualView
{
@ -115,13 +116,13 @@ namespace DualView
protected override void OnStart()
{
base.OnStart();
wm.RegisterLayoutChangeCallback(runOnUiThreadExecutor(), this);
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
}
protected override void OnStop()
{
base.OnStop();
wm.UnregisterLayoutChangeCallback(this);
wir.RemoveWindowLayoutInfoListener(this);
}
void UseSingleMode()

4
ListDetail/ListDetail.csproj
Просмотреть файл

@ -107,10 +107,10 @@
<Version>2.0.4.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>

8
ListDetail/MainActivity.cs
Просмотреть файл

@ -41,9 +41,7 @@ namespace ListDetail
dualPortrait = DualPortrait.NewInstance(items);
wir = new WindowInfoRepositoryCallbackAdapter(WindowInfoRepository.Companion.GetOrCreate(this));
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
SetupLayout();
}
@ -97,13 +95,13 @@ namespace ListDetail
protected override void OnStart()
{
base.OnStart();
wm.RegisterLayoutChangeCallback(runOnUiThreadExecutor(), this);
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
}
protected override void OnStop()
{
base.OnStop();
wm.UnregisterLayoutChangeCallback(this);
wir.RemoveWindowLayoutInfoListener(this);
}
void UseSingleMode()

16
TwoPage/MainActivity.cs
Просмотреть файл

@ -30,6 +30,7 @@ using Android.Util;
Use OnStart/Stop instead of OnAttachedToWindow/OnDetached
23-Aug-21 Update to androidx.window-1.0.0-beta01
HACK: need to JavaCast IDisplayFeature to IFoldingFeature
01-Sep-21 Updated to AndroidX.Window-1.0.0-beta02
*/
namespace TwoPage
{
@ -55,8 +56,6 @@ namespace TwoPage
View single;
View dual;
//LayoutStateChangeCallback layoutStateChangeCallback = new LayoutStateChangeCallback();
public bool ShowTwoPages { get; set; } = false;
protected override void OnCreate(Bundle savedInstanceState)
@ -66,7 +65,6 @@ namespace TwoPage
pagerAdapter = new PagerAdapter(SupportFragmentManager, fragments);
wir = new WindowInfoRepositoryCallbackAdapter(WindowInfoRepository.Companion.GetOrCreate(this));
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
single = LayoutInflater.Inflate(Resource.Layout.activity_main, null);
dual = LayoutInflater.Inflate(Resource.Layout.double_landscape_layout, null);
@ -123,6 +121,18 @@ namespace TwoPage
SetupLayout();
}
protected override void OnStart()
{
base.OnStart();
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
}
protected override void OnStop()
{
base.OnStop();
wir.RemoveWindowLayoutInfoListener(this);
}
void UseSingleMode()
{
//Setting layout for single portrait

4
TwoPage/TwoPage.csproj
Просмотреть файл

@ -99,10 +99,10 @@
<Version>2.0.4.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>

8
WindowManager/MainActivity.cs
Просмотреть файл

@ -26,13 +26,13 @@ using Java.Interop;
18-Aug-21 Updated to AndroidX.Window-1.0.0-beta01
Changing IFoldingFeature to interface broke the 'automatic' casting :(
HACK: need to JavaCast IDisplayFeature to IFoldingFeature
01-Sep-21 Updated to AndroidX.Window-1.0.0-beta02
*/
namespace WindowManagerDemo
{
[Activity(Label = "@string/app_name",
Theme = "@style/AppTheme",
MainLauncher = true)]//, // HACK: for some reason the Window Manager doesn't work when configuration changes are being handled
//ConfigurationChanges = Android.Content.PM.ConfigChanges.ScreenSize | Android.Content.PM.ConfigChanges.ScreenLayout | Android.Content.PM.ConfigChanges.Orientation | Android.Content.PM.ConfigChanges.SmallestScreenSize)]
MainLauncher = true)] //ConfigurationChanges = Android.Content.PM.ConfigChanges.ScreenSize | Android.Content.PM.ConfigChanges.ScreenLayout | Android.Content.PM.ConfigChanges.Orientation | Android.Content.PM.ConfigChanges.SmallestScreenSize)]
public class MainActivity : AppCompatActivity, IConsumer
{
const string TAG = "JWM"; // Jetpack Window Manager
@ -48,9 +48,7 @@ namespace WindowManagerDemo
wir = new WindowInfoRepositoryCallbackAdapter(WindowInfoRepository.Companion.GetOrCreate(this));
wmc = WindowMetricsCalculator.Companion.OrCreate; // HACK: source method is `getOrCreate`, binding generator munges this badly :(
wir.AddWindowLayoutInfoListener(runOnUiThreadExecutor(), this);
// Set our view from the "main" layout resource
SetContentView(Resource.Layout.activity_main);
constraintLayout = FindViewById<ConstraintLayout>(Resource.Id.constraint_layout);

2
WindowManager/README.md
Просмотреть файл

@ -2,7 +2,7 @@
Visit the [Window Manager for Xamarin docs](https://docs.microsoft.com/dual-screen/xamarin/) for more information on using Window Manager in your apps.
> NOTE: uses Xamarin.Android.Window.WindowJava-1.0.0.1-beta01, based on Jetpack Window Manager beta01 packages
> NOTE: uses Xamarin.Android.Window.WindowJava-1.0.0.1-beta02, based on Jetpack Window Manager beta02 packages
![Window Manager example spanned across two screens](../Screenshots/xamarin-window-manager.png)

2
WindowManager/Resources/values/strings.xml
Просмотреть файл

@ -1,5 +1,5 @@
<resources>
<string name="app_name">Xamarin WindowInfoRepository beta01</string>
<string name="app_name">Xamarin WindowInfoRepository beta02</string>
<string name="window_metrics">window metrics</string>
<string name="layout_change_text">layout change text</string>
<string name="configuration_changed">Using one logic/physical display - unspanned</string>

4
WindowManager/WindowManager.csproj
Просмотреть файл

@ -103,10 +103,10 @@
<Version>2.0.4.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava">
<Version>1.0.0.1-beta01</Version>
<Version>1.0.0.1-beta02</Version>
</PackageReference>
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0" />
</ItemGroup>