Skip to content

Commit

Permalink
Merge pull request #38 from devinZhou102/master
Browse files Browse the repository at this point in the history 
Fixed crash while using dropdown in android and iOS
  • Loading branch information
@enisn
enisn authored Sep 27, 2018
2 parents 0407a4e + 61faee9 commit de4b339
Show file tree
Hide file tree
Showing 13 changed files with 288 additions and 96 deletions.
2 changes: 1 addition & 1 deletion ...iewSample.InputKit/FormViewSample.InputKit.Android/FormViewSample.InputKit.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FormViewSample.InputKit\FormViewSample.InputKit.csproj">
<Project>{E3432B8D-D39C-4520-A0DD-996D75EE92E8}</Project>
<Project>{15D16C2C-2F95-467B-B466-6CA34F6FCF70}</Project>
<Name>FormViewSample.InputKit</Name>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion FormViewSample.InputKit/FormViewSample.InputKit.iOS/FormViewSample.InputKit.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\FormViewSample.InputKit\FormViewSample.InputKit.csproj">
<Project>{E3432B8D-D39C-4520-A0DD-996D75EE92E8}</Project>
<Project>{15D16C2C-2F95-467B-B466-6CA34F6FCF70}</Project>
<Name>FormViewSample.InputKit</Name>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion InputKit.nuspec
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<!-- The identifier that must be unique within the hosting gallery -->
Expand Down
134 changes: 67 additions & 67 deletions InputKit.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugin", "Plugin", "{12D598
README.md = README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.InputKit.Android", "Sample.InputKit\Sample.InputKit.Android\Sample.InputKit.Android.csproj", "{BB4B11C4-B014-4D02-A014-5A29F694A392}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.InputKit.iOS", "Sample.InputKit\Sample.InputKit.iOS\Sample.InputKit.iOS.csproj", "{06236AEA-E5E5-4B21-A0CA-BFD471850EFC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.InputKit", "Sample.InputKit\Sample.InputKit\Sample.InputKit.csproj", "{7BD830DC-A17D-47EC-87C2-5D7506C659E8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InputKit", "InputKit\InputKit.csproj", "{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.InputKit", "Sample.InputKit\Sample.InputKit\Sample.InputKit.csproj", "{7BD830DC-A17D-47EC-87C2-5D7506C659E8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FormViewSample", "FormViewSample", "{5B9A73D7-9FF6-433B-BD7A-01C705D5B0CB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormViewSample.InputKit.Android", "FormViewSample.InputKit\FormViewSample.InputKit.Android\FormViewSample.InputKit.Android.csproj", "{598465F0-BF63-4EEF-A21A-265D5446FC73}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormViewSample.InputKit.iOS", "FormViewSample.InputKit\FormViewSample.InputKit.iOS\FormViewSample.InputKit.iOS.csproj", "{7266B8FF-71CB-4EC5-9F2C-891BF323DA63}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FormViewSample.InputKit", "FormViewSample.InputKit\FormViewSample.InputKit\FormViewSample.InputKit.csproj", "{15D16C2C-2F95-467B-B466-6CA34F6FCF70}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormViewSample.InputKit", "FormViewSample.InputKit\FormViewSample.InputKit\FormViewSample.InputKit.csproj", "{15D16C2C-2F95-467B-B466-6CA34F6FCF70}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wiki", "Wiki", "{AA39162B-B93C-48CF-9566-8A04CCFF987C}"
ProjectSection(SolutionItems) = preProject
Wiki\DynamicRadioButtons.md = Wiki\DynamicRadioButtons.md
Wiki\SelectionView.md = Wiki\SelectionView.md
EndProjectSection
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Sample.InputKit.Android", "Sample.InputKit\Sample.InputKit.Android\Sample.InputKit.Android.csproj", "{2FA57D7E-30E6-4338-BF11-4BC79A426905}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "InputKit", "InputKit\InputKit.csproj", "{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Expand All @@ -48,42 +48,6 @@ Global
Release|iPhoneSimulator = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|Any CPU.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|iPhone.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|iPhone.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|iPhone.Build.0 = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|Any CPU.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|Any CPU.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|iPhone.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|iPhone.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|iPhone.Deploy.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{BB4B11C4-B014-4D02-A014-5A29F694A392}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{06236AEA-E5E5-4B21-A0CA-BFD471850EFC}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
{06236AEA-E5E5-4B21-A0CA-BFD471850EFC}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
{06236AEA-E5E5-4B21-A0CA-BFD471850EFC}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
Expand Down Expand Up @@ -128,30 +92,6 @@ Global
{7BD830DC-A17D-47EC-87C2-5D7506C659E8}.Release|iPhone.Build.0 = Release|Any CPU
{7BD830DC-A17D-47EC-87C2-5D7506C659E8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7BD830DC-A17D-47EC-87C2-5D7506C659E8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.AppStore|iPhone.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Debug|iPhone.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Release|Any CPU.Build.0 = Release|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Release|iPhone.ActiveCfg = Release|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Release|iPhone.Build.0 = Release|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{598465F0-BF63-4EEF-A21A-265D5446FC73}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{598465F0-BF63-4EEF-A21A-265D5446FC73}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{598465F0-BF63-4EEF-A21A-265D5446FC73}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
Expand Down Expand Up @@ -232,15 +172,75 @@ Global
{15D16C2C-2F95-467B-B466-6CA34F6FCF70}.Release|iPhone.Build.0 = Release|Any CPU
{15D16C2C-2F95-467B-B466-6CA34F6FCF70}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{15D16C2C-2F95-467B-B466-6CA34F6FCF70}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|Any CPU.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|iPhone.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|iPhone.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|iPhone.Build.0 = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|Any CPU.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|Any CPU.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|iPhone.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|iPhone.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|iPhone.Deploy.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{2FA57D7E-30E6-4338-BF11-4BC79A426905}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.AppStore|iPhone.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Debug|iPhone.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Release|Any CPU.Build.0 = Release|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Release|iPhone.ActiveCfg = Release|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Release|iPhone.Build.0 = Release|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B7F4F0DD-F749-4E39-9353-81B6BB56DFC8} = {12D59882-9FD8-4526-971D-CCFCB5FE6E9D}
{598465F0-BF63-4EEF-A21A-265D5446FC73} = {5B9A73D7-9FF6-433B-BD7A-01C705D5B0CB}
{7266B8FF-71CB-4EC5-9F2C-891BF323DA63} = {5B9A73D7-9FF6-433B-BD7A-01C705D5B0CB}
{15D16C2C-2F95-467B-B466-6CA34F6FCF70} = {5B9A73D7-9FF6-433B-BD7A-01C705D5B0CB}
{0D4EDD99-6439-48E9-8F9A-8B4DC0CA5431} = {12D59882-9FD8-4526-971D-CCFCB5FE6E9D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {526E41CC-02ED-4091-94D9-0EF473430852}
Expand Down
9 changes: 5 additions & 4 deletions InputKit/InputKit.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;MonoAndroid81;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;uap10.0.16299;</TargetFrameworks>
<!--<TargetFrameworks>netstandard2.0;MonoAndroid80;Xamarin.iOS10;</TargetFrameworks>-->
<!-- <TargetFrameworks>netstandard2.0;MonoAndroid81;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;uap10.0.16299;</TargetFrameworks> -->
<TargetFrameworks>netstandard2.0;MonoAndroid81;Xamarin.iOS10;</TargetFrameworks>
<AssemblyName>Plugin.InputKit</AssemblyName>
<RootNamespace>Plugin.InputKit</RootNamespace>
<PackageId>Xamarin.Forms.InputKit</PackageId>
Expand Down Expand Up @@ -50,8 +50,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.46" PrivateAssets="All" />
<PackageReference Include="Xamarin.Forms" Version="3.1.0.637273" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="Xamarin.Forms" Version="3.2.0.839982" PrivateAssets="All" />
<Compile Include="Shared\**\*.cs" />
</ItemGroup>

Expand All @@ -69,6 +69,7 @@
<AndroidResource Include="Resources\drawable-xhdpi\*.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\*.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\*.png" />
<AndroidResource Include="Resources\values\*.xml" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' ">
Expand Down
6 changes: 4 additions & 2 deletions InputKit/Platforms/Droid/MenuEffect.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ protected override void OnAttached()
if (Effect != null)
Effect.Parent.OnPopupRequest += OnPopupRequest;
Context context = Plugin.CurrentActivity.CrossCurrentActivity.Current.AppContext;
Context wrapper = new Android.Support.V7.View.ContextThemeWrapper(context,Resource.Style.MyPopupMenu);

if (Control != null)
{
ToggleMenu = new PopupMenu(context, Control);
ToggleMenu = new PopupMenu(wrapper, Control);
}
else if (Container != null)
{
ToggleMenu = new PopupMenu(context, Container);
ToggleMenu = new PopupMenu(wrapper, Container);
}
ToggleMenu.Gravity = (int)Android.Views.GravityFlags.Right;
ToggleMenu.MenuItemClick += MenuItemClick;
Expand Down
13 changes: 9 additions & 4 deletions InputKit/Platforms/iOS/MenuEffect.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Plugin.InputKit.Platforms.iOS;
using System;
using System.Collections.Generic;
using System.Linq;
using UIKit;
using Xamarin.Forms;
Expand Down Expand Up @@ -32,14 +34,17 @@ void OnPopupRequest(View view)
return;

RootViewController = UIApplication.SharedApplication.KeyWindow.RootViewController;

UIAlertController actionSheetAlert = UIAlertController.Create(null, null, UIAlertControllerStyle.Alert);

int i = 0;
UIAlertController actionSheetAlert = UIAlertController.Create(null, null, UIAlertControllerStyle.Alert);
var _enumerator = Effect.Parent.ItemsSource.GetEnumerator();
while (_enumerator.MoveNext())
{
actionSheetAlert.AddAction(UIAlertAction.Create(_enumerator.Current?.ToString(), UIAlertActionStyle.Default, (action) => Effect.Parent.InvokeItemSelected(_enumerator.Current?.ToString(), i)));
UIAlertAction alertAction = UIAlertAction.Create(_enumerator.Current?.ToString(), UIAlertActionStyle.Default, (action) =>
{
int index = actionSheetAlert.Actions.ToList<UIAlertAction>().IndexOf(action);
Effect.Parent.InvokeItemSelected(action.Title, index);
});
actionSheetAlert.AddAction(alertAction);
}

actionSheetAlert.AddAction(UIAlertAction.Create(UIAlertControllerCancelText, UIAlertActionStyle.Destructive, null));
Expand Down
7 changes: 7 additions & 0 deletions InputKit/Resources/values/input_styles.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<resources>

<style name ="MyPopupMenu" parent="Theme.AppCompat.Light.DarkActionBar">

</style>
</resources>
Loading

0 comments on commit de4b339

Please sign in to comment.