Skip to content
This repository was archived by the owner on Mar 26, 2025. It is now read-only.

Commit a77c4c6

Browse files
wcoderwcoder
authored
Merge pull request #4 from wcoder/fixes/forms-ios
- Fixed #3 - Orientation Lock for Xamarin.Forms iOS - New version 1.0.5
2 parents 73f8067 + ca4e6e8 commit a77c4c6

File tree

9 files changed

+83
-24
lines changed

9 files changed

+83
-24
lines changed

‎README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,20 @@ public override UIInterfaceOrientationMask GetSupportedInterfaceOrientations()
105105
```
106106
In your `Info.plist` need set all device orientations.
107107

108+
#### Xamarin.Forms iOS
109+
110+
If you want to lock orientation for the entire iOS application.
111+
112+
Add this code in your `AppDelegate.cs`:
113+
```csharp
114+
[Export("application:supportedInterfaceOrientationsForWindow:")]
115+
public UIInterfaceOrientationMask GetSupportedInterfaceOrientations(UIApplication application, IntPtr forWindow)
116+
{
117+
return DeviceOrientationImplementation.SupportedInterfaceOrientations;
118+
}
119+
```
120+
**Note:** In this case, to lock/unlock orientation on the one screen, you must use the `LockOrientation`/`UnlockOrientation` methods.
121+
108122
## Additional information
109123
* [Android - Handling Rotation](https://developer.xamarin.com/guides/android/application_fundamentals/handling_rotation/)
110124
* [Xamarin.Forms - Device Orientation](https://developer.xamarin.com/guides/xamarin-forms/user-interface/layouts/device-orientation/)

‎nuget/DeviceOrientation.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata minClientVersion="2.8.1">
44
<id>Plugin.DeviceOrientation</id>
5-
<version>1.0.4</version>
5+
<version>1.0.5</version>
66
<title>Device Orientation Plugin for Xamarin and Windows</title>
77
<authors>Yauheni Pakala</authors>
88
<owners>Yauheni Pakala</owners>

‎samples/Xamarin.Forms-sample/TestNugetDeviceOrientationPlugin/TestNugetDeviceOrientationPlugin.iOS/AppDelegate.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,13 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
2727

2828
return base.FinishedLaunching(app, options);
2929
}
30+
31+
32+
// Details: https://github.com/wcoder/Xamarin.Plugin.DeviceOrientation#xamarinforms-ios
33+
[Export("application:supportedInterfaceOrientationsForWindow:")]
34+
public UIInterfaceOrientationMask GetSupportedInterfaceOrientations(UIApplication application, IntPtr forWindow)
35+
{
36+
return Plugin.DeviceOrientation.DeviceOrientationImplementation.SupportedInterfaceOrientations;
37+
}
3038
}
3139
}

‎samples/Xamarin.Forms-sample/TestNugetDeviceOrientationPlugin/TestNugetDeviceOrientationPlugin/MainPage.xaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
xmlns:local="clr-namespace:TestNugetDeviceOrientationPlugin"
55
x:Class="TestNugetDeviceOrientationPlugin.MainPage">
66

7-
<Label x:Name="OrientationLabel" Text="..."
8-
VerticalOptions="Center"
9-
HorizontalOptions="Center" />
7+
<StackLayout VerticalOptions="Center" HorizontalOptions="Center">
8+
<Label Text="Click for lock/unlock:" />
9+
<Button x:Name="OrientationLabel" Text="..." />
10+
</StackLayout>
1011

1112
</ContentPage>

‎samples/Xamarin.Forms-sample/TestNugetDeviceOrientationPlugin/TestNugetDeviceOrientationPlugin/MainPage.xaml.cs

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
11
using Xamarin.Forms;
2+
23
using Plugin.DeviceOrientation;
34

45
namespace TestNugetDeviceOrientationPlugin
56
{
67
public partial class MainPage : ContentPage
78
{
9+
private bool _isLocked;
10+
811
public MainPage()
912
{
1013
InitializeComponent();
1114

1215
OrientationLabel.Text = CrossDeviceOrientation.Current.CurrentOrientation.ToString();
13-
CrossDeviceOrientation.Current.OrientationChanged += Current_OrientationChanged;
14-
}
1516

16-
private void Current_OrientationChanged(object sender, Plugin.DeviceOrientation.Abstractions.OrientationChangedEventArgs e)
17-
{
18-
OrientationLabel.Text = e.Orientation.ToString();
17+
// sample of screen orientation lock
18+
OrientationLabel.Clicked += (sender, args) =>
19+
{
20+
_isLocked = !_isLocked;
21+
22+
if (_isLocked)
23+
CrossDeviceOrientation.Current.LockOrientation(CrossDeviceOrientation.Current.CurrentOrientation);
24+
else
25+
CrossDeviceOrientation.Current.UnlockOrientation();
26+
};
27+
28+
// the sample of the event handler when screen orientation will change
29+
CrossDeviceOrientation.Current.OrientationChanged += (sender, args) =>
30+
{
31+
OrientationLabel.Text = args.Orientation.ToString();
32+
};
1933
}
2034
}
2135
}

‎src/DeviceOrientation.sln

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2005
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.DeviceOrientation", "DeviceOrientation\Plugin.DeviceOrientation\Plugin.DeviceOrientation.csproj", "{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.DeviceOrientation", "DeviceOrientation\Plugin.DeviceOrientation\Plugin.DeviceOrientation.csproj", "{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.DeviceOrientation.Abstractions", "DeviceOrientation\Plugin.DeviceOrientation.Abstractions\Plugin.DeviceOrientation.Abstractions.csproj", "{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.DeviceOrientation.Abstractions", "DeviceOrientation\Plugin.DeviceOrientation.Abstractions\Plugin.DeviceOrientation.Abstractions.csproj", "{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.DeviceOrientation.iOS", "DeviceOrientation\Plugin.DeviceOrientation.iOS\Plugin.DeviceOrientation.iOS.csproj", "{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}"
1111
EndProject
@@ -83,14 +83,14 @@ Global
8383
{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x64.Build.0 = Release|Any CPU
8484
{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x86.ActiveCfg = Release|Any CPU
8585
{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x86.Build.0 = Release|Any CPU
86-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU
87-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|Any CPU.Build.0 = AppStore|Any CPU
88-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|ARM.ActiveCfg = AppStore|Any CPU
89-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|ARM.Build.0 = AppStore|Any CPU
90-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x64.ActiveCfg = AppStore|Any CPU
91-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x64.Build.0 = AppStore|Any CPU
92-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x86.ActiveCfg = AppStore|Any CPU
93-
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x86.Build.0 = AppStore|Any CPU
86+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
87+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|Any CPU.Build.0 = Release|Any CPU
88+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|ARM.ActiveCfg = Release|Any CPU
89+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|ARM.Build.0 = Release|Any CPU
90+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x64.ActiveCfg = Release|Any CPU
91+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x64.Build.0 = Release|Any CPU
92+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x86.ActiveCfg = Release|Any CPU
93+
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.AppStore|x86.Build.0 = Release|Any CPU
9494
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9595
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
9696
{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -231,4 +231,7 @@ Global
231231
GlobalSection(SolutionProperties) = preSolution
232232
HideSolutionNode = FALSE
233233
EndGlobalSection
234+
GlobalSection(ExtensibilityGlobals) = postSolution
235+
SolutionGuid = {B9D655DC-088A-4F34-AE25-491866568F90}
236+
EndGlobalSection
234237
EndGlobal

‎src/DeviceOrientation/Plugin.DeviceOrientation.Android/Plugin.DeviceOrientation.Android.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1717
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
1818
<DevInstrumentationEnabled>True</DevInstrumentationEnabled>
19-
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
2020
</PropertyGroup>
2121
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2222
<DebugSymbols>true</DebugSymbols>
@@ -40,7 +40,7 @@
4040
<Reference Include="Mono.Android" />
4141
<Reference Include="mscorlib" />
4242
<Reference Include="Plugin.CurrentActivity, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\samples\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
43+
<HintPath>..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />

‎src/DeviceOrientation/Plugin.DeviceOrientation.Android/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid71" />
3+
<package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid80" />
44
</packages>

‎src/DeviceOrientation/Plugin.DeviceOrientation.iOS/DeviceOrientationImplementation.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ public static bool ShouldAutorotate
5656
public override DeviceOrientations CurrentOrientation =>
5757
Convert(UIApplication.SharedApplication.StatusBarOrientation);
5858

59+
public static UIInterfaceOrientationMask SupportedInterfaceOrientations =>
60+
ConvertToMask(_lockedOrientation);
5961

6062
public override void LockOrientation(DeviceOrientations orientation)
6163
{
@@ -106,6 +108,23 @@ private void SetDeviceOrientation(DeviceOrientations orientation)
106108
});
107109
}
108110

111+
private static UIInterfaceOrientationMask ConvertToMask(DeviceOrientations orientation)
112+
{
113+
switch (orientation)
114+
{
115+
case DeviceOrientations.Portrait:
116+
return UIInterfaceOrientationMask.Portrait;
117+
case DeviceOrientations.PortraitFlipped:
118+
return UIInterfaceOrientationMask.PortraitUpsideDown;
119+
case DeviceOrientations.LandscapeFlipped:
120+
return UIInterfaceOrientationMask.LandscapeRight;
121+
case DeviceOrientations.Landscape:
122+
return UIInterfaceOrientationMask.LandscapeLeft;
123+
default:
124+
return UIInterfaceOrientationMask.AllButUpsideDown;
125+
}
126+
}
127+
109128
private UIInterfaceOrientation Convert(DeviceOrientations orientation)
110129
{
111130
switch (orientation)

0 commit comments

Comments
 (0)