Adding disabled state icon for slider thumb.

Change-Id: I41e22ddc1afd368579a0c3900619a35e15d731f4
Signed-off-by: tarun.mahay <tarun.mahay@samsung.com>

diff --git a/VolumeApp/Core/ViewManager.cs b/VolumeApp/Core/ViewManager.cs
index 22bd01f3fe5f71c52bbf9127375c563616eeff29..95a68cb9eef797b5e6a9db4d46b8f36cdf1e1823 100644 (file)
--- a/VolumeApp/Core/ViewManager.cs
+++ b/VolumeApp/Core/ViewManager.cs
@@ -81,39 +81,39 @@ namespace VolumeApp.Core
         private void OnKeyEvent(object sender, Window.KeyEventArgs e)
         {
 
-        if (e.Key.KeyPressedName == "XF86AudioLowerVolume")
-        {
-            if (e.Key.State == Key.StateType.Down)
-            {
-                mainView.DecreaseSliderValue();
-                volumeAppAutoHideTimer.Stop();
-                Window.Instance.Show();
-            }
-            else if (e.Key.State == Key.StateType.Up)
+            if (e.Key.KeyPressedName == "XF86AudioLowerVolume")
             {
-                if (!mainView.IsAlertPopupShown())
+                if (e.Key.State == Key.StateType.Down)
                 {
-                    volumeAppAutoHideTimer.Start();
+                    mainView.DecreaseSliderValue();
+                    volumeAppAutoHideTimer.Stop();
+                    Window.Instance.Show();
+                }
+                else if (e.Key.State == Key.StateType.Up)
+                {
+                    if (!mainView.IsAlertPopupShown())
+                    {
+                        volumeAppAutoHideTimer.Start();
+                    }
                 }
             }
-        }
-        else if (e.Key.KeyPressedName == "XF86AudioRaiseVolume")
-        {
-            if (e.Key.State == Key.StateType.Down)
-            {
-                mainView.IncreaseSliderValue();
-                volumeAppAutoHideTimer.Stop();
-                Window.Instance.Show();
-            }
-            else if (e.Key.State == Key.StateType.Up)
+            else if (e.Key.KeyPressedName == "XF86AudioRaiseVolume")
             {
-                if (!mainView.IsAlertPopupShown())
+                if (e.Key.State == Key.StateType.Down)
                 {
-                    volumeAppAutoHideTimer.Start();
+                    mainView.IncreaseSliderValue();
+                    volumeAppAutoHideTimer.Stop();
+                    Window.Instance.Show();
+                }
+                else if (e.Key.State == Key.StateType.Up)
+                {
+                    if (!mainView.IsAlertPopupShown())
+                    {
+                        volumeAppAutoHideTimer.Start();
+                    }
                 }
             }
         }
-        }
         private void StartTimer()
         {
             volumeAppAutoHideTimer?.Start();
@@ -162,5 +162,5 @@ namespace VolumeApp.Core
             return true;
         }
     }
- }
+}
 

diff --git a/VolumeApp/Views/MainView.cs b/VolumeApp/Views/MainView.cs
index 03a776f614fd890d228e8aec9c872cece2f4e6b9..e2df3fed7a7e560a674a0f28807d4d3d2a34529d 100644 (file)
--- a/VolumeApp/Views/MainView.cs
+++ b/VolumeApp/Views/MainView.cs
@@ -222,6 +222,7 @@ namespace VolumeApp.Views
             {
                 Name = "CancelButton",
                 ThemeChangeSensitive = true,
+                Size2D = AppCommon.buttonSize,
             };
             increaseButton = new Button()
             {

diff --git a/VolumeApp/res/themes/dark.xaml b/VolumeApp/res/themes/dark.xaml
index 82ac33451600ea9330f6172146a882d9d0ae7e1a..75f559c2ca7e79ed1e88df27584cdc00d4c2f5d5 100644 (file)
--- a/VolumeApp/res/themes/dark.xaml
+++ b/VolumeApp/res/themes/dark.xaml
@@ -6,27 +6,27 @@ xmlns:c="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
 Id="DarkTheme">
 
        <ViewStyle x:Key="MainViewBackground" BackgroundColor="#16131A" ThemeChangeSensitive="true" />
-       <c:AlertDialogStyle x:Key="AlertDialogBackground" ThemeChangeSensitive="true" BackgroundColor="#16131A">
-               <c:AlertDialogStyle.TitleTextLabel>
-                       <TextLabelStyle TextColor="#FDFDFD" FontFamily="BreezeSans" PixelSize="24sp" />
-               </c:AlertDialogStyle.TitleTextLabel>
-               <c:AlertDialogStyle.MessageTextLabel>
-                       <TextLabelStyle TextColor="#FDFDFD" FontFamily="BreezeSans" PixelSize="24sp" />
-               </c:AlertDialogStyle.MessageTextLabel>
-       </c:AlertDialogStyle>
-       <c:ButtonStyle x:Key="CancelButton" ThemeChangeSensitive="true" Size="252sp, 48sp" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent" >
-               <c:ButtonStyle.BackgroundImage>*Resource*/Images/dark/button_outline.png</c:ButtonStyle.BackgroundImage>
-               <c:ButtonStyle.Text>
-                       <TextLabelStyle TextColor="#FF8A00" FontFamily="BreezeSans" PixelSize="24sp" Text="Cancel" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-               </c:ButtonStyle.Text>
-       </c:ButtonStyle>
-       <c:SliderStyle x:Key="Slider" >
-               <c:SliderStyle.Thumb>
-                       <ImageViewStyle>
-                               <ImageViewStyle.ResourceUrl>
-                                       <Selector x:TypeArguments="x:String" Normal="*Resource*/Images/dark/thumb_dark.png" />
-                               </ImageViewStyle.ResourceUrl>
-                       </ImageViewStyle>
-               </c:SliderStyle.Thumb>
-       </c:SliderStyle>
+    <c:AlertDialogStyle x:Key="AlertDialogBackground" ThemeChangeSensitive="true" BackgroundColor="#16131A">
+        <c:AlertDialogStyle.TitleTextLabel>
+            <TextLabelStyle TextColor="#FDFDFD" FontFamily="BreezeSans" PixelSize="24sp" />
+        </c:AlertDialogStyle.TitleTextLabel>
+        <c:AlertDialogStyle.MessageTextLabel>
+            <TextLabelStyle TextColor="#FDFDFD" FontFamily="BreezeSans" PixelSize="24sp" />
+        </c:AlertDialogStyle.MessageTextLabel>
+    </c:AlertDialogStyle>
+    <c:ButtonStyle x:Key="CancelButton" ThemeChangeSensitive="true" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent" >
+        <c:ButtonStyle.BackgroundImage>*Resource*/Images/dark/button_outline.png</c:ButtonStyle.BackgroundImage>
+        <c:ButtonStyle.Text>
+            <TextLabelStyle TextColor="#FF8A00" FontFamily="BreezeSans" PixelSize="24sp" Text="Cancel" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </c:ButtonStyle.Text>
+    </c:ButtonStyle>
+    <c:SliderStyle x:Key="Slider" >
+        <c:SliderStyle.Thumb>
+            <ImageViewStyle>
+                <ImageViewStyle.ResourceUrl>
+                    <Selector x:TypeArguments="x:String" Normal="*Resource*/Images/dark/thumb_dark.png" Disabled="*Resource*/Images/dark/thumb_dark.png" />
+                </ImageViewStyle.ResourceUrl>
+            </ImageViewStyle>
+        </c:SliderStyle.Thumb>
+    </c:SliderStyle>
 </Theme>
\ No newline at end of file

diff --git a/VolumeApp/res/themes/light.xaml b/VolumeApp/res/themes/light.xaml
index 66ac353cc3efa9b3f476866ca239c602434022a1..88a50abebd84beaf214dac2373cb44ebb1377c27 100644 (file)
--- a/VolumeApp/res/themes/light.xaml
+++ b/VolumeApp/res/themes/light.xaml
@@ -14,19 +14,19 @@ Id="LightTheme">
             <TextLabelStyle TextColor="#090E21" FontFamily="BreezeSans" PixelSize="24sp" />
         </c:AlertDialogStyle.MessageTextLabel>
     </c:AlertDialogStyle>
-    <c:ButtonStyle x:Key="CancelButton" ThemeChangeSensitive="true" Size="252sp, 48sp" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent" >
+    <c:ButtonStyle x:Key="CancelButton" ThemeChangeSensitive="true" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent" >
         <c:ButtonStyle.BackgroundImage>*Resource*/Images/light/button_outline.png</c:ButtonStyle.BackgroundImage>
         <c:ButtonStyle.Text>
             <TextLabelStyle TextColor="#FF6200" FontFamily="BreezeSans" PixelSize="24sp" Text="Cancel" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         </c:ButtonStyle.Text>
     </c:ButtonStyle>
     <c:SliderStyle x:Key="Slider" >
-      <c:SliderStyle.Thumb>
-        <ImageViewStyle>
-         <ImageViewStyle.ResourceUrl>
-            <Selector x:TypeArguments="x:String" Normal="*Resource*/Images/light/thumb_light.png" />
-            </ImageViewStyle.ResourceUrl>
-        </ImageViewStyle>
-      </c:SliderStyle.Thumb>
+        <c:SliderStyle.Thumb>
+            <ImageViewStyle>
+                <ImageViewStyle.ResourceUrl>
+                    <Selector x:TypeArguments="x:String" Normal="*Resource*/Images/light/thumb_light.png" Disabled="*Resource*/Images/light/thumb_light.png"/>
+                </ImageViewStyle.ResourceUrl>
+            </ImageViewStyle>
+        </c:SliderStyle.Thumb>
     </c:SliderStyle>
 </Theme>
\ No newline at end of file

diff --git a/packaging/org.tizen.volume-nui-1.0.0.tpk b/packaging/org.tizen.volume-nui-1.0.0.tpk
index 046a4a27769eb4b9b281f9d11e014b77fffca98f..b66e8e69f623c0366531882523c5ae34967223d7 100644 (file)
Binary files a/packaging/org.tizen.volume-nui-1.0.0.tpk and b/packaging/org.tizen.volume-nui-1.0.0.tpk differ