Changed NinePatchButton logic. (#65)

* Changed NinePatchButton logic.
* Simplified NinePatchButton control.
* Added more buttons styles.
* Refactored buttons styles calsses.

diff --git a/Fitness/Controls/NinePatchButton.cs b/Fitness/Controls/NinePatchButton.cs
index 767ada6ecd8cf6a1282c8974d7cd9b5ac9f8b275..d5e0c6e37682a6b5e44e57abe5979903b50a10ea 100644 (file)
--- a/Fitness/Controls/NinePatchButton.cs
+++ b/Fitness/Controls/NinePatchButton.cs
@@ -8,7 +8,8 @@ namespace Fitness.Controls
 {
     public class NinePatchButton : Button
     {
-        private Tizen.NUI.NPatchVisual visualMap;
+        private NPatchVisual backgroundVisualMap;
+        private NPatchVisual overlayVisualMap;
 
         public NinePatchButton()
         {
@@ -37,44 +38,42 @@ namespace Fitness.Controls
             UpdateButton();
         }
 
-        private void UpdateButton(Color color, string url)
+        private void UpdateButton()
         {
-            if (visualMap == null)
+            if (ViewStyle is NinePatchButtonStyle style)
             {
-                visualMap = new Tizen.NUI.NPatchVisual();
+                if (TryUpdateVisualMap(ref backgroundVisualMap, style.NinePatchBackgroundImageUrl, style.NinePatchBackgroundColor))
+                {
+                    Background = backgroundVisualMap.OutputVisualMap;
+                }
+
+                if (TryUpdateVisualMap(ref overlayVisualMap, style.NinePatchFrameImageUrl, style.NinePatchFrameColor))
+                {
+                    OverlayImage.Background = overlayVisualMap.OutputVisualMap;
+                }
             }
+        }
 
-            if (url != null)
+        private bool TryUpdateVisualMap(ref NPatchVisual visualMap, string url, Selector<Color> color)
+        {
+            if (visualMap is null)
             {
-                visualMap.URL = url;
+                visualMap = new NPatchVisual();
             }
 
-            if (color != null)
+            url = AsPath(url);
+
+            if (!string.IsNullOrEmpty(url) && (string.IsNullOrEmpty(visualMap.URL) || !visualMap.URL.Equals(url)))
             {
-                visualMap.MixColor = color;
+                visualMap.URL = url;
             }
 
-            Background = visualMap.OutputVisualMap;
-            OverlayImage.Background = visualMap.OutputVisualMap;
-        }
-
-        private void UpdateButton()
-        {
-            if (ViewStyle is NinePatchButtonStyle style && !string.IsNullOrEmpty(style.NormalImageUrl))
+            if (color is object && color.GetValue(ControlState, out Color c))
             {
-                if (ControlState == ControlState.Normal)
-                {
-                    UpdateButton(style.NormalColor, AsPath(style.NormalImageUrl));
-                }
-                else if (ControlState == ControlState.Pressed)
-                {
-                    UpdateButton(style.PressedColor, AsPath(style.PressedImageUrl ?? style.NormalImageUrl));
-                }
-                else if (ControlState == ControlState.Disabled)
-                {
-                    UpdateButton(style.DisabledColor, AsPath(style.DisabledImageUrl ?? style.NormalImageUrl));
-                }
+                visualMap.MixColor = c;
             }
+
+            return !string.IsNullOrEmpty(visualMap.URL) && visualMap.MixColor is object;
         }
     }
 }

diff --git a/Fitness/Views/Styles/BigLightButtonStyle.cs b/Fitness/Views/Styles/BigLightButtonStyle.cs
new file mode 100644 (file)
index 0000000..0cd8006
--- /dev/null
+++ b/Fitness/Views/Styles/BigLightButtonStyle.cs
@@ -0,0 +1,10 @@
+namespace Fitness.Views.Styles
+{
+    public class BigLightButtonStyle : LightButtonStyle
+    {
+        public BigLightButtonStyle()
+        {
+            Text.PixelSize = 40.0f;
+        }
+    }
+}

diff --git a/Fitness/Views/Styles/Buttons.cs b/Fitness/Views/Styles/Buttons.cs
index 3876f5be754869a9a5b29c8aa7445fd7b130f421..3b634487e898182bf9b117f59ef9db06dc6bd884 100644 (file)
--- a/Fitness/Views/Styles/Buttons.cs
+++ b/Fitness/Views/Styles/Buttons.cs
@@ -6,195 +6,25 @@ namespace Fitness.Views.Styles
 {
     public static class Buttons
     {
-        public static NinePatchButtonStyle Regular => new NinePatchButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            NormalImageUrl = "*Resource*/styles/button/button_full_28px.png",
-            PressedColor = new Color(240f / 255f, 245f / 255f, 252f / 255f, 1),
-            Text = new TextLabelStyle
-            {
-                PixelSize = 32.0f,
-                EnableMarkup = true,
-                TextColor = new Selector<Color>
-                {
-                    Normal = new Color(0.0f, 20.0f / 255.0f, 71 / 255.0f, 1.0f),
-                    Pressed = new Color(41.0f / 255.0f, 91.0f / 255.0f, 178 / 255.0f, 1.0f),
-                },
-                FontFamily = GetNavigationFont(),
-            },
-        };
+        public static NinePatchButtonStyle Regular => new LightButtonStyle();
 
-        public static NinePatchButtonStyle Inverse => new NinePatchButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            NormalImageUrl = "*Resource*/styles/button/button_full_28px.png",
-            NormalColor = new Color(10f / 255f, 14f / 255f, 74f / 255f, 1),
-            PressedColor = new Color(43f / 255f, 95f / 255f, 185f / 255f, 1),
-            Text = new TextLabelStyle
-            {
-                PixelSize = 32.0f,
-                TextColor = Color.White,
-                FontFamily = GetNavigationFont(),
-            },
-        };
+        public static NinePatchButtonStyle Inverse => new DarkButtonStyle();
 
-        public static NinePatchButtonStyle Previous => new NinePatchButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            NormalImageUrl = "*Resource*/styles/button/button_full_28px.png",
-            PressedColor = new Color(240f / 255f, 245f / 255f, 252f / 255f, 1),
-            Text = new TextLabelStyle
-            {
-                PixelSize = 24.0f,
-                TextColor = Color.Black,
-                FontFamily = GetNavigationFont(),
-                HorizontalAlignment = HorizontalAlignment.Begin,
-            },
-            Icon = new ImageViewStyle
-            {
-                ResourceUrl = new Selector<string>
-                {
-                    Normal = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active.png",
-                    Pressed = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active.png",
-                    Disabled = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active.png",
-                },
-            },
-            TextPadding = new Extents(20, 0, 0, 0),
-            IconRelativeOrientation = Button.IconOrientation.Left,
-        };
+        public static NinePatchButtonStyle Previous => new DirectionButtonStyle(Direction.Previous);
 
-        public static NinePatchButtonStyle Next => new NinePatchButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            NormalImageUrl = "*Resource*/styles/button/button_full_28px.png",
-            PressedColor = new Color(240f / 255f, 245f / 255f, 252f / 255f, 1),
-            Text = new TextLabelStyle
-            {
-                PixelSize = 24.0f,
-                TextColor = Color.Black,
-                FontFamily = GetNavigationFont(),
-                HorizontalAlignment = HorizontalAlignment.End,
-            },
-            Icon = new ImageViewStyle
-            {
-                ResourceUrl = new Selector<string>
-                {
-                    Normal = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active_reverse.png",
-                    Pressed = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active_reverse.png",
-                    Disabled = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active_reverse.png",
-                },
-            },
-            IconPadding = new Extents(20, 0, 0, 0),
-            IconRelativeOrientation = Button.IconOrientation.Left,
-        };
+        public static NinePatchButtonStyle Next => new DirectionButtonStyle(Direction.Next);
 
-        public static NinePatchButtonStyle RegularRepeat => new NinePatchButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            NormalImageUrl = "*Resource*/styles/button/button_full_28px.png",
-            PressedColor = new Color(240f / 255f, 245f / 255f, 252f / 255f, 1),
-            Text = new TextLabelStyle
-            {
-                PixelSize = 32.0f,
-                EnableMarkup = true,
-                TextColor = new Selector<Color>
-                {
-                    Normal = new Color(0.0f, 20.0f / 255.0f, 71 / 255.0f, 1.0f),
-                    Pressed = new Color(41.0f / 255.0f, 91.0f / 255.0f, 178 / 255.0f, 1.0f),
-                },
-                FontFamily = GetNavigationFont(),
-                HorizontalAlignment = HorizontalAlignment.Begin,
-            },
-            Icon = new ImageViewStyle
-            {
-                ResourceUrl = new Selector<string>
-                {
-                    Normal = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/icon-feather-repeat.png",
-                    Pressed = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/icon-feather-repeat.png",
-                    Disabled = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/icon-feather-repeat.png",
-                },
-            },
-            IconPadding = new Extents(276, 0, 0, 0),
-            TextPadding = new Extents(23, 0, 0, 0),
-            IconRelativeOrientation = Button.IconOrientation.Left,
-        };
+        public static NinePatchButtonStyle White => new WhiteButtonStyle();
 
-        public static NinePatchButtonStyle ReviewMovement => new NinePatchButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            Text = new TextLabelStyle
-            {
-                PixelSize = 32.0f,
-                EnableMarkup = true,
-                TextColor = new Selector<Color>
-                {
-                    Normal = new Color(0.0f, 20.0f / 255.0f, 71 / 255.0f, 1.0f),
-                    Pressed = new Color(41.0f / 255.0f, 91.0f / 255.0f, 178 / 255.0f, 1.0f),
-                },
-                FontFamily = GetNavigationFont(),
-                HorizontalAlignment = HorizontalAlignment.Begin,
-            },
-            Icon = new ImageViewStyle
-            {
-                ResourceUrl = new Selector<string>
-                {
-                    Normal = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/icon-feather-repeat.png",
-                    Pressed = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/icon-feather-repeat.png",
-                    Disabled = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/icon-feather-repeat.png",
-                },
-            },
-            IconPadding = new Extents(76, 0, 0, 0),
-            TextPadding = new Extents(24, 0, 0, 0),
-            IconRelativeOrientation = Button.IconOrientation.Left,
-        };
+        public static NinePatchButtonStyle RegularRepeat => new DarkButtonStyle();
 
-        public static ButtonStyle Transparent => new ButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            Text = new TextLabelStyle
-            {
-                PixelSize = 32.0f,
-                EnableMarkup = true,
-                TextColor = new Selector<Color>
-                {
-                    Normal = new Color(0.0f, 20.0f / 255.0f, 71 / 255.0f, 1.0f),
-                    Pressed = new Color(41.0f / 255.0f, 91.0f / 255.0f, 178 / 255.0f, 1.0f),
-                },
-                FontFamily = GetNavigationFont(),
-                HorizontalAlignment = HorizontalAlignment.Center,
-            },
-        };
+        public static ButtonStyle Transparent => new TransparentButtonStyle();
 
-        public static NinePatchButtonStyle Outline => new NinePatchButtonStyle
-        {
-            BackgroundColor = Color.Transparent,
-            NormalImageUrl = "*Resource*/styles/button/button_outline_28px.png",
-            NormalColor = new Color(10f / 255f, 14f / 255f, 74f / 255f, 1),
-            PressedColor = new Color(10f / 255f, 14f / 255f, 74f / 255f, 1),
-            Text = new TextLabelStyle
-            {
-                PixelSize = 32.0f,
-                EnableMarkup = true,
-                TextColor = new Selector<Color>
-                {
-                    Normal = new Color(0.0f, 20.0f / 255.0f, 71 / 255.0f, 1.0f),
-                    Pressed = new Color(41.0f / 255.0f, 91.0f / 255.0f, 178 / 255.0f, 1.0f),
-                },
-                FontFamily = GetNavigationFont(),
-            },
-        };
+        public static NinePatchButtonStyle Outline => new OutlineButtonStyle();
 
-        public static NinePatchButtonStyle RegularBig
-        {
-            get
-            {
-                var style = Regular;
-                style.Text.PixelSize = 40.0f;
-                return style;
-            }
-        }
+        public static NinePatchButtonStyle RegularBig => new BigLightButtonStyle();
 
-        public static ButtonStyle Back => new ButtonStyle
+        public static ButtonStyle Exit => new ButtonStyle
         {
             BackgroundColor = Color.Transparent,
             Overlay = new ImageViewStyle
@@ -202,13 +32,5 @@ namespace Fitness.Views.Styles
                 ResourceUrl = NUIApplication.Current.DirectoryInfo.Resource + "/styles/button/icon_exit.png",
             },
         };
-
-        private static Selector<string> GetNavigationFont()
-        {
-            return new Selector<string>
-            {
-                Normal = "BreezeSans",
-            };
-        }
     }
 }

diff --git a/Fitness/Views/Styles/DarkButtonStyle.cs b/Fitness/Views/Styles/DarkButtonStyle.cs
new file mode 100644 (file)
index 0000000..8bbe31b
--- /dev/null
+++ b/Fitness/Views/Styles/DarkButtonStyle.cs
@@ -0,0 +1,21 @@
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace Fitness.Views.Styles
+{
+    public class DarkButtonStyle : NinePatchButtonStyle
+    {
+        public DarkButtonStyle()
+        {
+            Text.TextColor = Tizen.NUI.Color.White;
+
+            NinePatchBackgroundColor = new Selector<Color>
+            {
+                Normal = new Color("#0A0E4A"),
+                Focused = new Color("#00338B"),
+                Pressed = new Color("#2B5FB9"),
+                Disabled = new Color("#C3CAD2"),
+            };
+        }
+    }
+}

diff --git a/Fitness/Views/Styles/DirectionButtonStyle.cs b/Fitness/Views/Styles/DirectionButtonStyle.cs
new file mode 100644 (file)
index 0000000..c4993f4
--- /dev/null
+++ b/Fitness/Views/Styles/DirectionButtonStyle.cs
@@ -0,0 +1,48 @@
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace Fitness.Views.Styles
+{
+    public enum Direction
+    {
+        Next,
+        Previous,
+    }
+
+    public class DirectionButtonStyle : LightButtonStyle
+    {
+        public DirectionButtonStyle(Direction direction)
+        {
+            Text.TextColor.Disabled = new Color("#C3CAD2");
+            Text.PixelSize = 24.0f;
+
+            NinePatchBackgroundColor.Disabled = null;
+            NinePatchFrameColor.Disabled = null;
+
+            if (direction == Direction.Previous)
+            {
+                Text.HorizontalAlignment = HorizontalAlignment.Begin;
+                TextPadding = new Extents(20, 0, 0, 0);
+                IconRelativeOrientation = Button.IconOrientation.Left;
+
+                Icon = new ImageViewStyle
+                {
+                    ResourceUrl = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active.png",
+                };
+            }
+            else
+            {
+                Text.HorizontalAlignment = HorizontalAlignment.End;
+                IconPadding = new Extents(20, 0, 0, 0);
+
+                // TODO: Temporarily commented due to NUI error.
+                // IconRelativeOrientation = Button.IconOrientation.Right;
+                Icon = new ImageViewStyle
+                {
+                    ResourceUrl = NUIApplication.Current.DirectoryInfo.Resource + "styles/button/12_icon_back_arrow_active_reverse.png",
+                };
+            }
+        }
+    }
+}

diff --git a/Fitness/Views/Styles/LightButtonStyle.cs b/Fitness/Views/Styles/LightButtonStyle.cs
new file mode 100644 (file)
index 0000000..0ecbc6b
--- /dev/null
+++ b/Fitness/Views/Styles/LightButtonStyle.cs
@@ -0,0 +1,34 @@
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace Fitness.Views.Styles
+{
+    public class LightButtonStyle : NinePatchButtonStyle
+    {
+        public LightButtonStyle()
+        {
+            Text.TextColor = new Selector<Color>
+            {
+                Normal = new Color("#000C2B"),
+                Focused = new Color("#00338B"),
+                Pressed = new Color("#2B5FB9"),
+                Disabled = Tizen.NUI.Color.White,
+            };
+
+            NinePatchBackgroundColor = new Selector<Color>
+            {
+                Normal = new Color("#FFFFFFB3"),
+                Pressed = new Color("#F0F5FC"),
+                Disabled = new Color("#C3CAD2"),
+            };
+
+            NinePatchFrameColor = new Selector<Color>
+            {
+                Normal = Tizen.NUI.Color.White,
+                Focused = new Color("#00338B"),
+                Pressed = Tizen.NUI.Color.Transparent,
+                Disabled = Tizen.NUI.Color.Transparent,
+            };
+        }
+    }
+}

diff --git a/Fitness/Views/Styles/NinePatchButtonStyle.cs b/Fitness/Views/Styles/NinePatchButtonStyle.cs
index afca2482d4aa505b0fdce5e4b8eb16df3b37fa73..ecabe268c2ce5bc06556da6555db24035646a334 100644 (file)
--- a/Fitness/Views/Styles/NinePatchButtonStyle.cs
+++ b/Fitness/Views/Styles/NinePatchButtonStyle.cs
@@ -1,19 +1,33 @@
-using Tizen.NUI.Components;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace Fitness.Views.Styles
 {
     public class NinePatchButtonStyle : ButtonStyle
     {
-        public string NormalImageUrl { get; set; }
+        public NinePatchButtonStyle()
+        {
+            // To avoid blinking:
+            BackgroundColor = Tizen.NUI.Color.Transparent;
 
-        public string PressedImageUrl { get; set; }
+            Text = new TextLabelStyle
+            {
+                PixelSize = 32.0f,
+                FontFamily = "BreezeSans",
+            };
 
-        public string DisabledImageUrl { get; set; }
+            NinePatchBackgroundImageUrl = "*Resource*/styles/button/9patch_fill_white.png";
 
-        public Tizen.NUI.Color NormalColor { get; set; }
+            NinePatchFrameImageUrl = "*Resource*/styles/button/9patch_outline_white.png";
+        }
 
-        public Tizen.NUI.Color PressedColor { get; set; }
+        public string NinePatchBackgroundImageUrl { get; set; }
 
-        public Tizen.NUI.Color DisabledColor { get; set; }
+        public Selector<Color> NinePatchBackgroundColor { get; set; }
+
+        public string NinePatchFrameImageUrl { get; set; }
+
+        public Selector<Color> NinePatchFrameColor { get; set; }
     }
 }

diff --git a/Fitness/Views/Styles/OutlineButtonStyle.cs b/Fitness/Views/Styles/OutlineButtonStyle.cs
new file mode 100644 (file)
index 0000000..467c33a
--- /dev/null
+++ b/Fitness/Views/Styles/OutlineButtonStyle.cs
@@ -0,0 +1,29 @@
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace Fitness.Views.Styles
+{
+    public class OutlineButtonStyle : NinePatchButtonStyle
+    {
+        public OutlineButtonStyle()
+        {
+            Text.TextColor = new Selector<Color>
+            {
+                Normal = new Color("#000C2B"),
+                Focused = new Color("#00338B"),
+                Pressed = new Color("#2B5FB9"),
+                Disabled = new Color("#C3CAD2"),
+            };
+
+            NinePatchBackgroundColor = new Color("#FFFFFF");
+
+            NinePatchFrameColor = new Selector<Color>
+            {
+                Normal = new Color("#0A0E4A"),
+                Focused = new Color("#00338B"),
+                Pressed = new Color("#2B5FB9"),
+                Disabled = new Color("#C3CAD2"),
+            };
+        }
+    }
+}

diff --git a/Fitness/Views/Styles/TransparentButtonStyle.cs b/Fitness/Views/Styles/TransparentButtonStyle.cs
new file mode 100644 (file)
index 0000000..5464e4a
--- /dev/null
+++ b/Fitness/Views/Styles/TransparentButtonStyle.cs
@@ -0,0 +1,17 @@
+using Tizen.NUI;
+
+namespace Fitness.Views.Styles
+{
+    public class TransparentButtonStyle : LightButtonStyle
+    {
+        public TransparentButtonStyle()
+        {
+            Text.TextColor.Disabled = Tizen.NUI.Color.White;
+
+            NinePatchBackgroundColor.Normal = Tizen.NUI.Color.Transparent;
+            NinePatchBackgroundColor.Disabled = new Color("#C3CAD2");
+
+            NinePatchFrameColor.Normal = Tizen.NUI.Color.Transparent;
+        }
+    }
+}

diff --git a/Fitness/Views/Styles/WhiteButtonStyle.cs b/Fitness/Views/Styles/WhiteButtonStyle.cs
new file mode 100644 (file)
index 0000000..69bcce5
--- /dev/null
+++ b/Fitness/Views/Styles/WhiteButtonStyle.cs
@@ -0,0 +1,18 @@
+using Tizen.NUI;
+
+namespace Fitness.Views.Styles
+{
+    public class WhiteButtonStyle : LightButtonStyle
+    {
+        public WhiteButtonStyle()
+        {
+            Text.TextColor.Disabled = new Color("#C3CAD2");
+
+            NinePatchBackgroundColor.Normal = new Color("#FFF");
+            NinePatchBackgroundColor.Disabled = Tizen.NUI.Color.Transparent;
+
+            NinePatchFrameColor.Normal = Tizen.NUI.Color.Transparent;
+            NinePatchFrameColor.Disabled = new Color("#FFF");
+        }
+    }
+}

diff --git a/Fitness/res/layout/MainView.xaml b/Fitness/res/layout/MainView.xaml
index ea38c8b6dacaa20a0dd50d777e86788053e446c0..22ee2cc60872ed3848ef72e99cb0d06c2341986f 100644 (file)
--- a/Fitness/res/layout/MainView.xaml
+++ b/Fitness/res/layout/MainView.xaml
@@ -16,7 +16,7 @@
   <View.Layout>
       <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top"/>
   </View.Layout>
-  <nui:Button BindingContext="{Binding Source={x:Reference context}}" Size="{views:SizeInUnits Width=12, Height=12}" Margin="{views:ExtentsInUnits Start=12, Top=12, Bottom=8}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Back}" Command="{Binding Exit}" />
+  <nui:Button BindingContext="{Binding Source={x:Reference context}}" Size="{views:SizeInUnits Width=12, Height=12}" Margin="{views:ExtentsInUnits Start=12, Top=12, Bottom=8}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Exit}" Command="{Binding Exit}" />
   <View Margin="{views:ExtentsInUnits Start=16,End=16}" Weight="1.0" WidthSpecification="-1" HeightSpecification="-1">
       <View.Layout>
           <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Begin"/>

diff --git a/Fitness/res/layout/PauseView.xaml b/Fitness/res/layout/PauseView.xaml
index 4b17dd774fe46bcc446fcbe2eceb1416f0a89e7d..ff119a877d534ecc74a68a647ea20faeb3160723 100644 (file)
--- a/Fitness/res/layout/PauseView.xaml
+++ b/Fitness/res/layout/PauseView.xaml
@@ -41,7 +41,7 @@
                                       Text="Try again"
                                       Weight="1"
                                       Command="{Binding TryAgain}"
-                                      behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.ReviewMovement}}"/>
+                                      behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Transparent}}"/>
                 <View HeightSpecification="-1"
                       WidthSpecification="-1"
                       BackgroundColor="Transparent"
@@ -82,8 +82,7 @@
                                       Weight="1"
                                       Command="{Binding PauseResumeWorkout}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Regular}}"/>
-                <View HeightSpecification="-1"
-                      WidthSpecification="-1"
+                <View HeightResizePolicy="FillToParent"
                       BackgroundColor="Transparent"
                       Weight="1"/>
             </View>

diff --git a/Fitness/res/styles/button/9patch_fill_white.png b/Fitness/res/styles/button/9patch_fill_white.png
new file mode 100644 (file)
index 0000000..c1ad008
Binary files /dev/null and b/Fitness/res/styles/button/9patch_fill_white.png differ

diff --git a/Fitness/res/styles/button/9patch_outline_white.png b/Fitness/res/styles/button/9patch_outline_white.png
new file mode 100644 (file)
index 0000000..990b5cf
Binary files /dev/null and b/Fitness/res/styles/button/9patch_outline_white.png differ

diff --git a/Fitness/res/styles/button/button_full_28px.png b/Fitness/res/styles/button/button_full_28px.png
deleted file mode 100644 (file)
index 9bdbe89..0000000
Binary files a/Fitness/res/styles/button/button_full_28px.png and /dev/null differ

diff --git a/Fitness/res/styles/button/button_outline_28px.png b/Fitness/res/styles/button/button_outline_28px.png
deleted file mode 100644 (file)
index a638f6e..0000000
Binary files a/Fitness/res/styles/button/button_outline_28px.png and /dev/null differ