diff options
10 files changed, 29 insertions, 64 deletions
diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj index 03964ad7..c3f7ca00 100644 --- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj +++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj @@ -6,10 +6,9 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="ElmSharp" Version="1.1.0-beta-018" /> - <PackageReference Include="Tizen.Applications" Version="1.3.2" /> - <PackageReference Include="Tizen.Location" Version="1.0.5" /> - <PackageReference Include="Tizen.Maps" Version="1.0.8" /> + <PackageReference Include="ElmSharp" Version="1.2.0-beta-001" /> + <PackageReference Include="Tizen.Location" Version="1.0.7" /> + <PackageReference Include="Tizen.Maps" Version="1.0.9" /> </ItemGroup> <ItemGroup> diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec index dbbf0f51..ceb35014 100644 --- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec +++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec @@ -12,6 +12,9 @@ <copyright>Copyright 2016</copyright> <dependencies> <dependency id="Xamarin.Forms.Maps" version="2.3.5.233-pre1" /> + <dependency id="ElmSharp" version="1.2.0-beta-001" /> + <dependency id="Tizen.Location" version="1.0.7" /> + <dependency id="Tizen.Maps" version="1.0.9" /> </dependencies> </metadata> <files> diff --git a/Xamarin.Forms.Platform.Tizen/Native/Dialog.cs b/Xamarin.Forms.Platform.Tizen/Native/Dialog.cs index c59755f7..6d1dde16 100644 --- a/Xamarin.Forms.Platform.Tizen/Native/Dialog.cs +++ b/Xamarin.Forms.Platform.Tizen/Native/Dialog.cs @@ -25,11 +25,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native } /// <summary> - /// Occurs when the hardware Back button is pressed. - /// </summary> - public event EventHandler BackButtonPressed; - - /// <summary> /// Occurs whenever the dialog is first displayed. /// </summary> public event EventHandler Shown; @@ -155,8 +150,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native ApplyButton(ButtonPosition.Negative, null); ApplyContent(null); - UngrabBackKey(); - base.OnUnrealize(); } @@ -166,7 +159,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native /// <remarks>When shown, the dialog will register itself for the back key press event handling.</remarks> protected virtual void OnShown() { - GrabBackKey(); } /// <summary> @@ -175,7 +167,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native /// <remarks>When dismissed, the dialog will unregister itself from the back key press event handling.</remarks> protected virtual void OnDismissed() { - UngrabBackKey(); } /// <summary> @@ -199,15 +190,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native { OnShown(); }; - - // Adds a handler for the KeyUp event. - // The handler checks whether the key just pressed is a back key - // and if that is the case, invokes the back button press handler of this instance. - KeyUp += (s, e) => - { - if (e.KeyName == EvasKeyEventArgs.PlatformBackButtonName) - BackButtonPressed?.Invoke(this, EventArgs.Empty); - }; } /// <summary> @@ -262,22 +244,5 @@ namespace Xamarin.Forms.Platform.Tizen.Native SetPartContent("default", _content, true); } - - /// <summary> - /// Registers this instance to be affected by pressing the hardware back key. - /// </summary> - void GrabBackKey() - { - KeyGrab(EvasKeyEventArgs.PlatformBackButtonName, true); - } - - /// <summary> - /// Unregisters this instance from being affected by pressing the hardware back key. - /// </summary> - void UngrabBackKey() - { - KeyUngrab(EvasKeyEventArgs.PlatformBackButtonName); - } - } } diff --git a/Xamarin.Forms.Platform.Tizen/Native/Window.cs b/Xamarin.Forms.Platform.Tizen/Native/Window.cs index 2bc45c66..3e982ae5 100644 --- a/Xamarin.Forms.Platform.Tizen/Native/Window.cs +++ b/Xamarin.Forms.Platform.Tizen/Native/Window.cs @@ -24,11 +24,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native public event EventHandler Closed; /// <summary> - /// Notifies that the back button has been pressed. - /// </summary> - public event EventHandler BackButtonPressed; - - /// <summary> /// Gets the current orientation. /// </summary> public DisplayOrientations CurrentOrientation @@ -105,15 +100,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native Unrealize(); }; - KeyGrab(EvasKeyEventArgs.PlatformBackButtonName, false); - KeyUp += (s, e) => - { - if (e.KeyName == EvasKeyEventArgs.PlatformBackButtonName) - { - BackButtonPressed?.Invoke(this, EventArgs.Empty); - } - }; - Active(); AutoDeletion = false; Show(); diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs index aed7b9d6..f7aef30f 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs @@ -7,7 +7,6 @@ namespace Xamarin.Forms.Platform.Tizen { //TODO need to add internationalization support const string DialogTitle = "Choose Date"; - static readonly EColor s_defaultTextColor = EColor.White; public DatePickerRenderer() { @@ -70,7 +69,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } } diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs index 6080d647..663e56b1 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs @@ -8,7 +8,6 @@ namespace Xamarin.Forms.Platform.Tizen { public class PickerRenderer : ViewRenderer<Picker, Native.Button> { - static readonly EColor s_defaultTextColor = EColor.White; internal List _list; internal Native.Dialog _dialog; Dictionary<ListItem, int> _itemToItemNumber = new Dictionary<ListItem, int>(); @@ -62,7 +61,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } void OnClick(object sender, EventArgs e) diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs index 9f964c18..68e697ed 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs @@ -11,8 +11,6 @@ namespace Xamarin.Forms.Platform.Tizen static readonly string s_defaultFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern; - static readonly EColor s_defaultTextColor = EColor.White; - string _format; TimeSpan _time; @@ -83,7 +81,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } void UpdateTime() diff --git a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj index 9a13995c..a324b32d 100755..100644 --- a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj +++ b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj @@ -6,9 +6,11 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="ElmSharp" Version="1.1.0-beta-021" /> + <PackageReference Include="Tizen" Version="1.0.5" /> + <PackageReference Include="Tizen.Applications.Common" Version="1.5.5" /> + <PackageReference Include="Tizen.Applications.UI" Version="1.5.5" /> + <PackageReference Include="ElmSharp" Version="1.2.0-beta-001" /> <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" /> - <PackageReference Include="Tizen.Applications" Version="1.3.2" /> <PackageReference Include="Tizen.System.Information" Version="1.0.2" /> <PackageReference Include="Tizen.WebView" Version="1.0.0" /> </ItemGroup> diff --git a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec index d4df1577..5e5ef408 100644 --- a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec +++ b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec @@ -13,6 +13,11 @@ <copyright>Copyright 2016</copyright> <dependencies> <dependency id="Xamarin.Forms" version="2.3.5.233-pre1" /> + <dependency id="Tizen.Applications.Common" version="1.5.5" /> + <dependency id="Tizen.Applications.UI" version="1.5.5" /> + <dependency id="ElmSharp" version="1.2.0-beta-001" /> + <dependency id="Tizen.System.Information" version="1.0.2" /> + <dependency id="Tizen.WebView" version="1.0.0" /> </dependencies> </metadata> <files> diff --git a/packaging/xamarin-forms-tizen.spec b/packaging/xamarin-forms-tizen.spec index 02ba5d3d..a805986d 100644 --- a/packaging/xamarin-forms-tizen.spec +++ b/packaging/xamarin-forms-tizen.spec @@ -2,7 +2,7 @@ %define XF_RELEASE 233 # Increase this XF_DEV_VERSION when any public APIs of Xamarin.Forms.Platform.Tizen are changed. -%define XF_DEV_VERSION 004 +%define XF_DEV_VERSION 007 Name: xamarin-forms-tizen Summary: Xamarin.Forms for Tizen platform @@ -23,7 +23,8 @@ BuildRequires: dotnet-build-tools # C# API Requires BuildRequires: elm-sharp-nuget BuildRequires: csapi-tizen-nuget -BuildRequires: csapi-application-nuget +BuildRequires: csapi-application-common-nuget +BuildRequires: csapi-application-ui-nuget BuildRequires: csapi-information-nuget BuildRequires: csapi-location-nuget BuildRequires: csapi-maps-nuget @@ -37,6 +38,14 @@ controls of Android, iOS, Windows Phone, and Tizen. %package nuget Summary: NuGet package for %{name} Group: Development/Libraries +Requires: elm-sharp-nuget +Requires: csapi-tizen-nuget +Requires: csapi-application-common-nuget +Requires: csapi-application-ui-nuget +Requires: csapi-information-nuget +Requires: csapi-location-nuget +Requires: csapi-maps-nuget +Requires: csapi-webview-nuget %description nuget NuGet package for %{name} |