From 60e5f357579a2efc0b5dcbd0faca8734966635f4 Mon Sep 17 00:00:00 2001 From: "k.stepaniuk" Date: Tue, 8 Dec 2020 16:38:03 +0100 Subject: [PATCH] Fixing circleCI Signed-off-by: k.stepaniuk --- Fitness/Controls/NinePatchButton.cs | 24 ++++++++++++------------ Fitness/Views/Styles/NinePatchButtonStyle.cs | 5 +++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Fitness/Controls/NinePatchButton.cs b/Fitness/Controls/NinePatchButton.cs index a078ab8..b1370ab 100644 --- a/Fitness/Controls/NinePatchButton.cs +++ b/Fitness/Controls/NinePatchButton.cs @@ -13,6 +13,17 @@ namespace Fitness.Controls this.Relayout += NinePatchButton_Relayout; } + private static string AsPath(string url) + { + if (!string.IsNullOrEmpty(url) && url.Contains("*Resource*")) + { + string resource = Tizen.Applications.Application.Current.DirectoryInfo.Resource; + url = url.Replace("*Resource*", resource); + } + + return url; + } + protected override void OnControlStateChanged(ControlStateChangedEventArgs controlStateChangedInfo) { UpdateButton(); @@ -24,17 +35,6 @@ namespace Fitness.Controls UpdateButton(); } - private static string AsPath(string url) - { - if (!String.IsNullOrEmpty(url) && url.Contains("*Resource*")) - { - string resource = Tizen.Applications.Application.Current.DirectoryInfo.Resource; - url = url.Replace("*Resource*", resource); - } - - return url; - } - private void UpdateButton(Color color, string url) { PropertyMap outputVisualMap = null; @@ -60,7 +60,7 @@ namespace Fitness.Controls private void UpdateButton() { - if (ViewStyle is NinePatchButtonStyle style && !String.IsNullOrEmpty(style.NormalImageUrl)) + if (ViewStyle is NinePatchButtonStyle style && !string.IsNullOrEmpty(style.NormalImageUrl)) { if (ControlState == ControlState.Normal) { diff --git a/Fitness/Views/Styles/NinePatchButtonStyle.cs b/Fitness/Views/Styles/NinePatchButtonStyle.cs index 9ba6bb4..afca248 100644 --- a/Fitness/Views/Styles/NinePatchButtonStyle.cs +++ b/Fitness/Views/Styles/NinePatchButtonStyle.cs @@ -5,10 +5,15 @@ namespace Fitness.Views.Styles public class NinePatchButtonStyle : ButtonStyle { public string NormalImageUrl { get; set; } + public string PressedImageUrl { get; set; } + public string DisabledImageUrl { get; set; } + public Tizen.NUI.Color NormalColor { get; set; } + public Tizen.NUI.Color PressedColor { get; set; } + public Tizen.NUI.Color DisabledColor { get; set; } } } -- 2.7.4