Update NUI 7.5 UX

Change-Id: Ie0e51354a60fea299bbf77f751bc3654807ff753
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/default_theme/dark/shared/res/IoT_check_off.png b/default_theme/dark/shared/res/IoT_check_off.png
new file mode 100644 (file)
index 0000000..e467050
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_check_off.png differ

diff --git a/default_theme/dark/shared/res/IoT_check_off_W.png b/default_theme/dark/shared/res/IoT_check_off_W.png
deleted file mode 100644 (file)
index cbb27f9..0000000
Binary files a/default_theme/dark/shared/res/IoT_check_off_W.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_check_off_d.png b/default_theme/dark/shared/res/IoT_check_off_d.png
new file mode 100644 (file)
index 0000000..8fcb3fe
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_check_off_d.png differ

diff --git a/default_theme/dark/shared/res/IoT_check_off_f.png b/default_theme/dark/shared/res/IoT_check_off_f.png
new file mode 100644 (file)
index 0000000..e50dca4
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_check_off_f.png differ

diff --git a/default_theme/dark/shared/res/IoT_check_off_fW.png b/default_theme/dark/shared/res/IoT_check_off_fW.png
deleted file mode 100644 (file)
index 8bf6223..0000000
Binary files a/default_theme/dark/shared/res/IoT_check_off_fW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_check_off_pW.png b/default_theme/dark/shared/res/IoT_check_off_pW.png
deleted file mode 100644 (file)
index ba15985..0000000
Binary files a/default_theme/dark/shared/res/IoT_check_off_pW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_check_on.png b/default_theme/dark/shared/res/IoT_check_on.png
new file mode 100644 (file)
index 0000000..94aee7e
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_check_on.png differ

diff --git a/default_theme/dark/shared/res/IoT_check_on_W.png b/default_theme/dark/shared/res/IoT_check_on_W.png
deleted file mode 100644 (file)
index 6263d5e..0000000
Binary files a/default_theme/dark/shared/res/IoT_check_on_W.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_check_on_d.png b/default_theme/dark/shared/res/IoT_check_on_d.png
new file mode 100644 (file)
index 0000000..eb18deb
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_check_on_d.png differ

diff --git a/default_theme/dark/shared/res/IoT_check_on_dW.png b/default_theme/dark/shared/res/IoT_check_on_dW.png
deleted file mode 100644 (file)
index cb76356..0000000
Binary files a/default_theme/dark/shared/res/IoT_check_on_dW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_check_on_f.png b/default_theme/dark/shared/res/IoT_check_on_f.png
new file mode 100644 (file)
index 0000000..27ad15f
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_check_on_f.png differ

diff --git a/default_theme/dark/shared/res/IoT_check_on_fW.png b/default_theme/dark/shared/res/IoT_check_on_fW.png
deleted file mode 100644 (file)
index d5d3d9f..0000000
Binary files a/default_theme/dark/shared/res/IoT_check_on_fW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_check_on_pW.png b/default_theme/dark/shared/res/IoT_check_on_pW.png
deleted file mode 100644 (file)
index 8cb2265..0000000
Binary files a/default_theme/dark/shared/res/IoT_check_on_pW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_loading_circle_dark.json b/default_theme/dark/shared/res/IoT_loading_circle_dark.json
new file mode 100644 (file)
index 0000000..bdba91e
--- /dev/null
+++ b/default_theme/dark/shared/res/IoT_loading_circle_dark.json
@@ -0,0 +1 @@
+{"v":"5.9.0","fr":30,"ip":0,"op":30,"w":200,"h":200,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"DT_small Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0],"e":[-359]},{"t":30}],"ix":10},"p":{"a":0,"k":[100,100,0],"ix":2,"l":2},"a":{"a":0,"k":[100,100,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-14.536,-0.952],[-11.556,-8.867],[-4.682,-13.794],[3.77,-14.07]],"o":[[12.615,-7.283],[14.535,0.953],[11.557,8.868],[4.682,13.793],[0,0]],"v":[[-55.868,-36.091],[-14.226,-45.801],[25.793,-30.739],[50.699,4.018],[52.098,46.753]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.541176470588,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":16,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[119.043,72.309],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":30,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"DT_big Outlines","sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0],"e":[359]},{"t":30}],"ix":10},"p":{"a":0,"k":[100,100,0],"ix":2,"l":2},"a":{"a":0,"k":[100,100,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[12.112,8.092],[5.574,13.457],[-2.842,14.287],[-10.3,10.3],[-14.287,2.842],[-13.457,-5.574],[-8.093,-12.112],[0,-14.566]],"o":[[-14.567,0],[-12.111,-8.093],[-5.575,-13.458],[2.841,-14.287],[10.3,-10.3],[14.286,-2.842],[13.458,5.574],[8.093,12.111],[0,0]],"v":[[0.714,74.363],[-40.204,61.951],[-67.329,28.898],[-71.521,-13.655],[-51.365,-51.365],[-13.655,-71.521],[28.898,-67.33],[61.951,-40.204],[74.363,0.713]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.541176470588,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":16,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[99.286,99.287],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":30,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file

diff --git a/default_theme/dark/shared/res/IoT_pagination.png b/default_theme/dark/shared/res/IoT_pagination.png
new file mode 100644 (file)
index 0000000..ab477a1
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_pagination.png differ

diff --git a/default_theme/dark/shared/res/IoT_pagination_s.png b/default_theme/dark/shared/res/IoT_pagination_s.png
new file mode 100644 (file)
index 0000000..6cfff9f
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_pagination_s.png differ

diff --git a/default_theme/dark/shared/res/IoT_progress_indeterminate.png b/default_theme/dark/shared/res/IoT_progress_indeterminate.png
new file mode 100644 (file)
index 0000000..d6535f4
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_progress_indeterminate.png differ

diff --git a/default_theme/dark/shared/res/IoT_slider_handler_normal.png b/default_theme/dark/shared/res/IoT_slider_handler_normal.png
new file mode 100644 (file)
index 0000000..aeab307
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_slider_handler_normal.png differ

diff --git a/default_theme/dark/shared/res/IoT_slider_handler_pressed.png b/default_theme/dark/shared/res/IoT_slider_handler_pressed.png
new file mode 100644 (file)
index 0000000..fcee1f9
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_slider_handler_pressed.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_thumb.png b/default_theme/dark/shared/res/IoT_switch_thumb.png
new file mode 100644 (file)
index 0000000..d8ab053
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_thumb.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_thumb_d.png b/default_theme/dark/shared/res/IoT_switch_thumb_d.png
new file mode 100644 (file)
index 0000000..71b0965
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_thumb_d.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_thumb_s.png b/default_theme/dark/shared/res/IoT_switch_thumb_s.png
new file mode 100644 (file)
index 0000000..2890e06
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_thumb_s.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_thumb_sW.png b/default_theme/dark/shared/res/IoT_switch_thumb_sW.png
deleted file mode 100644 (file)
index 1fe7127..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_thumb_sW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_thumb_sfW.png b/default_theme/dark/shared/res/IoT_switch_thumb_sfW.png
deleted file mode 100644 (file)
index 90808b7..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_thumb_sfW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_thumb_spW.png b/default_theme/dark/shared/res/IoT_switch_thumb_spW.png
deleted file mode 100644 (file)
index 5ec5fc3..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_thumb_spW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track.png b/default_theme/dark/shared/res/IoT_switch_track.png
new file mode 100644 (file)
index 0000000..7ec6424
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_track.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_d.png b/default_theme/dark/shared/res/IoT_switch_track_d.png
new file mode 100644 (file)
index 0000000..3fe357a
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_track_d.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_f.png b/default_theme/dark/shared/res/IoT_switch_track_f.png
new file mode 100644 (file)
index 0000000..4d4741f
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_track_f.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_fs.png b/default_theme/dark/shared/res/IoT_switch_track_fs.png
new file mode 100644 (file)
index 0000000..a37a03f
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_track_fs.png differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_off_W.png b/default_theme/dark/shared/res/IoT_switch_track_off_W.png
deleted file mode 100644 (file)
index f8388de..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_track_off_W.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_off_fW.png b/default_theme/dark/shared/res/IoT_switch_track_off_fW.png
deleted file mode 100644 (file)
index 9a3cfb6..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_track_off_fW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_off_pW.png b/default_theme/dark/shared/res/IoT_switch_track_off_pW.png
deleted file mode 100644 (file)
index 6d5d126..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_track_off_pW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_on_dW.png b/default_theme/dark/shared/res/IoT_switch_track_on_dW.png
deleted file mode 100644 (file)
index ac25fd7..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_track_on_dW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_on_fW.png b/default_theme/dark/shared/res/IoT_switch_track_on_fW.png
deleted file mode 100644 (file)
index 90afec3..0000000
Binary files a/default_theme/dark/shared/res/IoT_switch_track_on_fW.png and /dev/null differ

diff --git a/default_theme/dark/shared/res/IoT_switch_track_s.png b/default_theme/dark/shared/res/IoT_switch_track_s.png
new file mode 100644 (file)
index 0000000..2bab39f
Binary files /dev/null and b/default_theme/dark/shared/res/IoT_switch_track_s.png differ

diff --git a/default_theme/dark/shared/res/Tizen.NUI.Components.Theme.xaml b/default_theme/dark/shared/res/Tizen.NUI.Components.Theme.xaml
index 55508ef2fd6997744906c17770b763155c719efd..71117d0508843c94542b36552b76645d093dae3c 100755 (executable)
--- a/default_theme/dark/shared/res/Tizen.NUI.Components.Theme.xaml
+++ b/default_theme/dark/shared/res/Tizen.NUI.Components.Theme.xaml
@@ -6,175 +6,288 @@
   Id="org.tizen.default-dark-theme"
   Version="1.0.0" >
 
-    <c:ButtonStyle x:Key="Tizen.NUI.Components.Button">
-      <c:ButtonStyle.BackgroundColor>
-        <Selector x:TypeArguments="Color"
-          Normal="#1473e6"
-          Pressed="#2b5fb9"
-          Focused="#00338b"
-          Disabled="#c3cad2"/>
-      </c:ButtonStyle.BackgroundColor>
-    </c:ButtonStyle>
-
-    <c:ButtonStyle x:Key="Tizen.NUI.Components.CheckBox">
-      <c:ButtonStyle.Icon>
+  <ViewStyle x:Key="Tizen.NUI.Components.ContentPage"
+    BackgroundColor="#16131A" />
+
+  <c:AppBarStyle x:Key="Tizen.NUI.Components.AppBar">
+    <c:AppBarStyle.BackButton>
+      <c:ButtonStyle>
+        <c:ButtonStyle.Icon>
           <ImageViewStyle>
-            <ImageViewStyle.ResourceUrl>
-                <Selector x:TypeArguments="x:String"
-                  Normal="{ThemeResourcePath IoT_check_off_W.png}"
-                  Pressed="{ThemeResourcePath IoT_check_off_pW.png}"
-                  Disabled="{NUIResourcePath IoT_check_off_d.png}"
-                  Focused="{ThemeResourcePath IoT_check_off_fW.png}"
-                  Selected="{ThemeResourcePath IoT_check_on_W.png}"
-                  SelectedPressed="{ThemeResourcePath IoT_check_on_pW.png}"
-                  SelectedFocused="{ThemeResourcePath IoT_check_on_fW.png}"
-                  DisabledSelected="{ThemeResourcePath IoT_check_on_dW.png}" />
-            </ImageViewStyle.ResourceUrl>
+            <ImageViewStyle.Color>
+              <Selector x:TypeArguments="Color" Normal="#FF8A00" Pressed="#3B393E" Focused="#1F1C22" Disabled="#3B393E" />
+            </ImageViewStyle.Color>
           </ImageViewStyle>
-      </c:ButtonStyle.Icon>
-      <c:ButtonStyle.Text>
-        <TextLabelStyle
-          TextColor="White"/>
-      </c:ButtonStyle.Text>
-    </c:ButtonStyle>
-
-    <c:ButtonStyle x:Key="Tizen.NUI.Components.RadioButton">
-      <c:ButtonStyle.Icon>
+        </c:ButtonStyle.Icon>
+      </c:ButtonStyle>
+    </c:AppBarStyle.BackButton>
+    <c:AppBarStyle.TitleTextLabel>
+      <TextLabelStyle TextColor="#FDFDFD"/>
+    </c:AppBarStyle.TitleTextLabel>
+    <c:AppBarStyle.ActionButton>
+      <c:ButtonStyle>
+        <c:ButtonStyle.Text>
+          <TextLabelStyle>
+            <TextLabelStyle.TextColor>
+              <Selector x:TypeArguments="Color" Normal="#FF8A00" Pressed="#995300" Focused="#E67C00" Disabled="#666666" />
+            </TextLabelStyle.TextColor>
+          </TextLabelStyle>
+        </c:ButtonStyle.Text>
+        <c:ButtonStyle.Icon>
+          <ImageViewStyle Color="#16131A" />
+        </c:ButtonStyle.Icon>
+      </c:ButtonStyle>
+    </c:AppBarStyle.ActionButton>
+  </c:AppBarStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.Button">
+    <c:ButtonStyle.BackgroundColor>
+      <Selector x:TypeArguments="Color" Normal="#FF8A00" Pressed="#CC6E00" Focused="#E57C00" Selected="#995300" Disabled="#666666" />
+    </c:ButtonStyle.BackgroundColor>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle TextColor="#16131A"/>
+    </c:ButtonStyle.Text>
+    <c:ButtonStyle.Icon>
+      <ImageViewStyle Color="#16131A"/>
+    </c:ButtonStyle.Icon>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.Button.Outlined">
+    <c:ButtonStyle.BorderlineColorSelector>
+      <Selector x:TypeArguments="Color" Normal="#FF8A00" Pressed="#CC6E00" Focused="#E57C00" Selected="#995300" Disabled="#666666" />
+    </c:ButtonStyle.BorderlineColorSelector>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FF8A00" Pressed="#CC6E00" Focused="#E57C00" Selected="#995300" Disabled="#666666" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.Button.TextOnly">
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FF8A00" Pressed="#CC6E00" Focused="#E57C00" Selected="#995300" Disabled="#666666" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.CheckBox">
+    <c:ButtonStyle.Icon>
         <ImageViewStyle>
           <ImageViewStyle.ResourceUrl>
               <Selector x:TypeArguments="x:String"
-                Normal="{ThemeResourcePath IoT_radiobutton_off_W.png}"
-                Pressed="{ThemeResourcePath IoT_radiobutton_off_pW.png}"
-                Disabled="{ThemeResourcePath IoT_radiobutton_off_dW.png}"
-                Focused="{ThemeResourcePath IoT_radiobutton_off_fW.png}"
-                Selected="{ThemeResourcePath IoT_radiobutton_on_W.png}"
-                SelectedPressed="{ThemeResourcePath IoT_radiobutton_on_pW.png}"
-                SelectedFocused="{ThemeResourcePath IoT_radiobutton_on_fW.png}"
-                DisabledSelected="{ThemeResourcePath IoT_radiobutton_on_dW.png}" />
+                Normal="{ThemeResourcePath IoT_check_off.png}"
+                Pressed="{ThemeResourcePath IoT_check_off.png}"
+                Disabled="{ThemeResourcePath IoT_check_off_d.png}"
+                Focused="{ThemeResourcePath IoT_check_off_f.png}"
+                Selected="{ThemeResourcePath IoT_check_on.png}"
+                SelectedPressed="{ThemeResourcePath IoT_check_on.png}"
+                SelectedFocused="{ThemeResourcePath IoT_check_on_f.png}"
+                DisabledSelected="{ThemeResourcePath IoT_check_on_d.png}" />
           </ImageViewStyle.ResourceUrl>
         </ImageViewStyle>
-      </c:ButtonStyle.Icon>
-      <c:ButtonStyle.Text>
-          <TextLabelStyle
-            TextColor="White" />
-      </c:ButtonStyle.Text>
-    </c:ButtonStyle>
-
-    <c:SliderStyle x:Key="Tizen.NUI.Components.Slider">
-      <c:SliderStyle.Progress>
-          <ImageViewStyle
-            ResourceUrl="{NUIResourcePath IoT_slider_status_trackW.png}"
-            BackgroundColor="White" />
-      </c:SliderStyle.Progress>
-      <c:SliderStyle.Thumb>
-          <ImageViewStyle
-            ResourceUrl="{NUIResourcePath IoT_slider_handler_normalW.png}" />
-      </c:SliderStyle.Thumb>
-      <c:SliderStyle.ValueIndicatorImage>
-          <ImageViewStyle
-            BackgroundColor="White" />
-      </c:SliderStyle.ValueIndicatorImage>
-    </c:SliderStyle>
-
-    <c:SwitchStyle x:Key="Tizen.NUI.Components.Switch">
-      <c:Switch.Track>
+    </c:ButtonStyle.Icon>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Selected="#FF8A00" Disabled="#666666" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.RadioButton">
+    <c:ButtonStyle.Icon>
+      <ImageViewStyle>
+        <ImageViewStyle.ResourceUrl>
+            <Selector x:TypeArguments="x:String"
+              Normal="{ThemeResourcePath IoT_radiobutton_off_W.png}"
+              Disabled="{ThemeResourcePath IoT_radiobutton_off_dW.png}"
+              Focused="{ThemeResourcePath IoT_radiobutton_off_fW.png}"
+              Selected="{ThemeResourcePath IoT_radiobutton_on_W.png}"
+              SelectedFocused="{ThemeResourcePath IoT_radiobutton_on_fW.png}"
+              DisabledSelected="{ThemeResourcePath IoT_radiobutton_on_dW.png}" />
+        </ImageViewStyle.ResourceUrl>
+      </ImageViewStyle>
+    </c:ButtonStyle.Icon>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Selected="#FF8A00" Disabled="#666666" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ProgressStyle x:Key="Tizen.NUI.Components.Progress"
+    IndeterminateImageUrl="{ThemeResourcePath IoT_progress_indeterminate.png}">
+    <c:ProgressStyle.Track>
+      <ImageViewStyle BackgroundColor="#3B393E" />
+    </c:ProgressStyle.Track>
+    <c:ProgressStyle.Buffer>
+      <ImageViewStyle BackgroundColor="#FF8A00" />
+    </c:ProgressStyle.Buffer>
+    <c:ProgressStyle.Progress>
+      <ImageViewStyle BackgroundColor="#FF8A00" />
+    </c:ProgressStyle.Progress>
+  </c:ProgressStyle>
+
+  <c:SwitchStyle x:Key="Tizen.NUI.Components.Switch">
+    <c:SwitchStyle.Track>
+      <ImageViewStyle>
+        <ImageViewStyle.ResourceUrl>
+          <Selector x:TypeArguments="x:String"
+              Normal="{ThemeResourcePath IoT_switch_track.png}"
+              Disabled="{ThemeResourcePath IoT_switch_track_d.png}"
+              Focused="{ThemeResourcePath IoT_switch_track_f.png}"
+              Selected="{ThemeResourcePath IoT_switch_track_s.png}"
+              SelectedFocused="{ThemeResourcePath IoT_switch_fs.png}"
+              DisabledSelected="{ThemeResourcePath IoT_switch_track_d.png}" />
+        </ImageViewStyle.ResourceUrl>
+      </ImageViewStyle>
+    </c:SwitchStyle.Track>
+    <c:SwitchStyle.Thumb>
         <ImageViewStyle>
           <ImageViewStyle.ResourceUrl>
             <Selector x:TypeArguments="x:String"
-                Normal="{ThemeResourcePath IoT_switch_track_off_W.png}"
-                Pressed="{ThemeResourcePath IoT_switch_track_off_pW.png}"
-                Disabled="{NUIResourcePath IoT_switch_track_off_d.png}"
-                Focused="{ThemeResourcePath IoT_switch_track_off_fW.png}"
-                Selected="{NUIResourcePath IoT_switch_track_on.png}"
-                SelectedPressed="{ThemeResourcePath IoT_switch_track_on_fW.png}"
-                SelectedFocused="{ThemeResourcePath IoT_switch_track_on_fW.png}"
-                DisabledSelected="{ThemeResourcePath IoT_switch_track_on_dW.png}" />
+              Normal="{ThemeResourcePath IoT_switch_thumb.png}"
+              Disabled="{ThemeResourcePath IoT_switch_thumb_d.png}"
+              Selected="{ThemeResourcePath IoT_switch_thumb_s.png}" />
           </ImageViewStyle.ResourceUrl>
         </ImageViewStyle>
-      </c:Switch.Track>
-      <c:Switch.Thumb>
-          <ImageViewStyle>
-            <ImageViewStyle.ResourceUrl>
-              <Selector x:TypeArguments="x:String"
-                Normal="{NUIResourcePath IoT_switch_thumb_d.png}"
-                Disabled="{NUIResourcePath IoT_switch_thumb_d.png}"
-                Selected="{ThemeResourcePath IoT_switch_thumb_sW.png}"
-                SelectedPressed="{ThemeResourcePath IoT_switch_thumb_spW.png}"
-                SelectedFocused="{ThemeResourcePath IoT_switch_thumb_sfW.png}" />
-            </ImageViewStyle.ResourceUrl>
-          </ImageViewStyle>
-      </c:Switch.Thumb>
-      <c:Switch.Text>
-          <TextLabelStyle
-            TextColor="White" />
-      </c:Switch.Text>
-    </c:SwitchStyle>
-
-    <ViewStyle x:Key="Tizen.NUI.Components.ContentPage"
-      BackgroundColor="#0E1017" />
-
-    <c:AppBarStyle x:Key="Tizen.NUI.Components.AppBar"
-      BackgroundColor="#0E1017">
-      <c:AppBarStyle.BackButton>
-        <c:ButtonStyle>
-          <c:ButtonStyle.Icon>
-            <ImageViewStyle>
-              <ImageViewStyle.Color>
-                <Selector x:TypeArguments="Color"
-                  Normal="White"
-                  Focused="#00338B"
-                  Pressed="#1473E6"
-                  Disabled="#6B707C" />
-              </ImageViewStyle.Color>
-            </ImageViewStyle>
-          </c:ButtonStyle.Icon>
-        </c:ButtonStyle>
-      </c:AppBarStyle.BackButton>
-      <c:AppBarStyle.TitleTextLabel>
-        <TextLabelStyle
-          TextColor="White"/>
-      </c:AppBarStyle.TitleTextLabel>
-      <c:AppBarStyle.ActionButton>
-        <c:ButtonStyle>
-          <c:ButtonStyle.Text>
-            <TextLabelStyle>
-              <TextLabelStyle.TextColor>
-                <Selector x:TypeArguments="Color"
-                  Normal="White"
-                  Focused="#00338B"
-                  Pressed="#1473E6"
-                  Disabled="#6B707C" />
-              </TextLabelStyle.TextColor>
-            </TextLabelStyle>
-          </c:ButtonStyle.Text>
-          <c:ButtonStyle.Icon>
-            <ImageViewStyle>
-              <ImageViewStyle.Color>
-                <Selector x:TypeArguments="Color"
-                  Normal="White"
-                  Focused="#00338B"
-                  Pressed="#1473E6"
-                  Disabled="#6B707C" />
-              </ImageViewStyle.Color>
-            </ImageViewStyle>
-          </c:ButtonStyle.Icon>
-        </c:ButtonStyle>
-      </c:AppBarStyle.ActionButton>
-    </c:AppBarStyle>
-
-    <TextLabelStyle x:Key="NotificationToast"
-      BackgroundColor="#000209"
-      TextColor="White" />
-
-    <c:AlertDialogStyle x:Key="Tizen.NUI.Components.AlertDialog"
-      BackgroundColor="#000209">
-      <c:AlertDialogStyle.TitleTextLabel>
-        <TextLabelStyle
-          TextColor="White" />
-      </c:AlertDialogStyle.TitleTextLabel>
-      <c:AlertDialogStyle.MessageTextLabel>
-        <TextLabelStyle
-          TextColor="White"/>
-      </c:AlertDialogStyle.MessageTextLabel>
-    </c:AlertDialogStyle>
+    </c:SwitchStyle.Thumb>
+    <c:SwitchStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Disabled="#666666" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:SwitchStyle.Text>
+  </c:SwitchStyle>
+
+  <c:LoadingStyle x:Key="Tizen.NUI.Components.Loading" LottieResourceUrl="{ThemeResourcePath IoT_loading_circle_dark.json}" />
+
+  <c:SliderStyle x:Key="Tizen.NUI.Components.Slider">
+    <c:SliderStyle.Track>
+        <ImageViewStyle BackgroundColor="#3B393E" />
+    </c:SliderStyle.Track>
+    <c:SliderStyle.Progress>
+        <ImageViewStyle>
+          <ImageViewStyle.BackgroundColor>
+            <Selector x:TypeArguments="Color" Normal="#FF8A00" Disabled="#CACACA" />
+          </ImageViewStyle.BackgroundColor>
+        </ImageViewStyle>
+    </c:SliderStyle.Progress>
+    <c:SliderStyle.Thumb>
+      <ImageViewStyle>
+        <ImageViewStyle.ResourceUrl>
+          <Selector x:TypeArguments="x:String"
+            Normal="{ThemeResourcePath IoT_slider_handler_normal.png}"
+            Pressed="{ThemeResourcePath IoT_slider_handler_pressed.png}"
+            Disabled="{NUIResourcePath IoT_slider_handler_disabled.png}" />
+        </ImageViewStyle.ResourceUrl>
+      </ImageViewStyle>
+    </c:SliderStyle.Thumb>
+    <c:SliderStyle.ValueIndicatorImage>
+        <ImageViewStyle BorderlineColor="#FF8A00" />
+    </c:SliderStyle.ValueIndicatorImage>
+    <c:SliderStyle.ValueIndicatorText>
+        <TextLabelStyle TextColor="#FF8A00" />
+    </c:SliderStyle.ValueIndicatorText>
+  </c:SliderStyle>
+
+  <c:PaginationStyle x:Key="Tizen.NUI.Components.Pagination">
+    <c:PaginationStyle.IndicatorImageUrl>
+      <Selector x:TypeArguments="x:String"
+        Normal="{ThemeResourcePath IoT_pagination.png}"
+        Selected="{ThemeResourcePath IoT_pagination_s.png}" />
+    </c:PaginationStyle.IndicatorImageUrl>
+  </c:PaginationStyle>
+  
+  <ViewStyle x:Key="Tizen.NUI.Components.TabBar" BackgroundColor="#16131A" />
+
+  <c:TabButtonStyle x:Key="Tizen.NUI.Components.TabButton">
+    <c:TabButtonStyle.BackgroundColor>
+      <Selector x:TypeArguments="Color" Selected="#29262C" Pressed="#3B393F" Other="#16131A" />
+    </c:TabButtonStyle.BackgroundColor>
+    <c:TabButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Disabled="#666666" Other="#FF8A00" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:TabButtonStyle.Text>
+    <c:TabButtonStyle.Icon>
+      <ImageViewStyle>
+        <ImageViewStyle.Color>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Disabled="#666666" Other="#FF8A00" />
+        </ImageViewStyle.Color>
+      </ImageViewStyle>
+    </c:TabButtonStyle.Icon>
+  </c:TabButtonStyle>
+
+  <c:AlertDialogStyle x:Key="Tizen.NUI.Components.AlertDialog" BackgroundColor="#16131A" BoxShadow="8.0 | #FFFFFF29 | 0, 2">
+    <c:AlertDialogStyle.TitleTextLabel>
+      <TextLabelStyle TextColor="#FDFDFD" />
+    </c:AlertDialogStyle.TitleTextLabel>
+    <c:AlertDialogStyle.MessageTextLabel>
+      <TextLabelStyle TextColor="#FDFDFD"/>
+    </c:AlertDialogStyle.MessageTextLabel>
+  </c:AlertDialogStyle>
+
+  <TextLabelStyle x:Key="NotificationToast" BackgroundColor="#16131A" TextColor="#FDFDFD" BoxShadow="8.0 | #FFFFFF29 | 0, 2"/>
+
+  <c:TimePickerStyle x:Key="Tizen.NUI.Components.TimePicker">
+    <c:TimePickerStyle.Pickers>
+      <c:PickerStyle>
+        <c:PickerStyle.ItemTextLabel>
+          <TextLabelStyle BackgroundColor="#16131A" TextColor="#FDFDFD"/>
+        </c:PickerStyle.ItemTextLabel>
+      </c:PickerStyle>
+    </c:TimePickerStyle.Pickers>
+  </c:TimePickerStyle>
+
+  <c:DatePickerStyle x:Key="Tizen.NUI.Components.DatePicker">
+    <c:DatePickerStyle.Pickers>
+      <c:PickerStyle>
+        <c:PickerStyle.ItemTextLabel>
+          <TextLabelStyle BackgroundColor="#16131A" TextColor="#FDFDFD"/>
+        </c:PickerStyle.ItemTextLabel>
+      </c:PickerStyle>
+    </c:DatePickerStyle.Pickers>
+  </c:DatePickerStyle>
+
+  <c:DefaultLinearItemStyle x:Key="Tizen.NUI.Components.DefaultLinearItem">
+    <c:DefaultLinearItemStyle.Label>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Disabled="#666666" Other="#FF8A00" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:DefaultLinearItemStyle.Label>
+    <c:DefaultLinearItemStyle.SubLabel>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Disabled="#666666" Other="#FF8A00" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:DefaultLinearItemStyle.SubLabel>
+  </c:DefaultLinearItemStyle>
+
+  <c:DefaultGridItemStyle x:Key="Tizen.NUI.Components.DefaultGridItem" BoxShadow="12.0 | #FFFFFF29 | 0, 4">
+    <c:DefaultGridItemStyle.BackgroundColor>
+      <Selector x:TypeArguments="Color" Normal="#16131A" Pressed="#3B393F" Selected="#29262C" Focused="#1F1C23" Disabled="#16131A" />
+    </c:DefaultGridItemStyle.BackgroundColor>
+    <c:DefaultGridItemStyle.Label>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FDFDFD" Disabled="#666666" Other="#FF8A00" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:DefaultGridItemStyle.Label>
+  </c:DefaultGridItemStyle>
 </Theme>
\ No newline at end of file

diff --git a/default_theme/dark/shared/res/Tizen.NUI.Theme.xaml b/default_theme/dark/shared/res/Tizen.NUI.Theme.xaml
index 6dabf00aaf04f19e72db63e8307f55aa20597eba..4b6e0d16dab51a341ab1429c80dfdcfdec9b6fd4 100755 (executable)
--- a/default_theme/dark/shared/res/Tizen.NUI.Theme.xaml
+++ b/default_theme/dark/shared/res/Tizen.NUI.Theme.xaml
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Theme
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:c="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
   Id="org.tizen.default-dark-theme"
   Version="1.0.0" >
 
-    <TextLabelStyle x:Key="Tizen.NUI.BaseComponents.TextLabel"
-      TextColor="1.00, 1.00, 1.00, 1" />
+  <TextLabelStyle x:Key="Tizen.NUI.BaseComponents.TextLabel"
+    TextColor="0.99, 0.99, 0.99, 1" />
 
-    <TextFieldStyle x:Key="Tizen.NUI.BaseComponents.TextField"
-      TextColor="1.00, 1.00, 1.00, 1"
-      SelectionHighlightColor="1.00, 1.00, 1.00, 0.20" />
-
-    <TextEditorStyle x:Key="Tizen.NUI.BaseComponents.TextEditor"
-      TextColor="1.00, 1.00, 1.00, 1"
-      SelectionHighlightColor="1.00, 1.00, 1.00, 0.20" />
+  <TextFieldStyle x:Key="Tizen.NUI.BaseComponents.TextField"
+    TextColor="0.99, 0.99, 0.99, 1"
+    PlaceholderTextColor="0.79, 0.79, 0.79, 1"
+    PrimaryCursorColor="0.99, 0.99, 0.99, 1"
+    SecondaryCursorColor="0.99, 0.99, 0.99, 1"
+    SelectionHighlightColor="1, 0.54, 0, 0.3"
+    GrabHandleColor="1, 1, 1, 1" />
 
+  <TextEditorStyle x:Key="Tizen.NUI.BaseComponents.TextEditor"
+    TextColor="0.99, 0.99, 0.99, 1"
+    PlaceholderTextColor="0.79, 0.79, 0.79, 1"
+    PrimaryCursorColor="0.99, 0.99, 0.99, 1"
+    SecondaryCursorColor="0.99, 0.99, 0.99, 1"
+    SelectionHighlightColor="1, 0.54, 0, 0.3"
+    GrabHandleColor="1, 1, 1, 1" />
 </Theme>
\ No newline at end of file

diff --git a/default_theme/dark/shared/res/icon/icon.png b/default_theme/dark/shared/res/icon/icon.png
deleted file mode 100644 (file)
index 9765b1b..0000000
Binary files a/default_theme/dark/shared/res/icon/icon.png and /dev/null differ

diff --git a/default_theme/light/shared/res/Tizen.NUI.Components.Theme.xaml b/default_theme/light/shared/res/Tizen.NUI.Components.Theme.xaml
index 105b6eadab7172234fb69d215070c6682d1ffbf9..ae6bac0366568557e3a9d81944b7a05c7fe3cae8 100755 (executable)
--- a/default_theme/light/shared/res/Tizen.NUI.Components.Theme.xaml
+++ b/default_theme/light/shared/res/Tizen.NUI.Components.Theme.xaml
@@ -6,175 +6,288 @@
   Id="org.tizen.default-light-theme"
   Version="1.0.0" >
 
-    <c:ButtonStyle x:Key="Tizen.NUI.Components.Button">
-      <c:ButtonStyle.BackgroundColor>
-        <Selector x:TypeArguments="Color"
-          Normal="0.039, 0.055, 0.29, 1"
-          Pressed="0.106, 0.412, 0.792, 1"
-          Focused="0, 0.2, 0.545, 1"
-          Disabled="0.765, 0.792, 0.824, 1"/>
-      </c:ButtonStyle.BackgroundColor>
-    </c:ButtonStyle>
-
-    <c:ButtonStyle x:Key="Tizen.NUI.Components.CheckBox">
-      <c:ButtonStyle.Icon>
+  <ViewStyle x:Key="Tizen.NUI.Components.ContentPage"
+    BackgroundColor="#FAFAFA" />
+
+  <c:AppBarStyle x:Key="Tizen.NUI.Components.AppBar">
+    <c:AppBarStyle.BackButton>
+      <c:ButtonStyle>
+        <c:ButtonStyle.Icon>
           <ImageViewStyle>
-            <ImageViewStyle.ResourceUrl>
-                <Selector x:TypeArguments="x:String"
-                  Normal="{NUIResourcePath IoT_check_off.png}"
-                  Pressed="{NUIResourcePath IoT_check_off_p.png}"
-                  Disabled="{NUIResourcePath IoT_check_off_d.png}"
-                  Focused="{NUIResourcePath IoT_check_off_f.png}"
-                  Selected="{NUIResourcePath IoT_check_on.png}"
-                  SelectedPressed="{NUIResourcePath IoT_check_on_p.png}"
-                  SelectedFocused="{NUIResourcePath IoT_check_on_f.png}"
-                  DisabledSelected="{NUIResourcePath IoT_check_on_d.png}" />
-            </ImageViewStyle.ResourceUrl>
+            <ImageViewStyle.Color>
+              <Selector x:TypeArguments="Color" Normal="#17234D" Pressed="#FFA166" Focused="#FF7119" Disabled="#CACACA" />
+            </ImageViewStyle.Color>
           </ImageViewStyle>
-      </c:ButtonStyle.Icon>
-      <c:ButtonStyle.Text>
-        <TextLabelStyle
-          TextColor="#001447"/>
-      </c:ButtonStyle.Text>
-    </c:ButtonStyle>
-
-    <c:ButtonStyle x:Key="Tizen.NUI.Components.RadioButton">
-      <c:ButtonStyle.Icon>
+        </c:ButtonStyle.Icon>
+      </c:ButtonStyle>
+    </c:AppBarStyle.BackButton>
+    <c:AppBarStyle.TitleTextLabel>
+      <TextLabelStyle TextColor="#090E21"/>
+    </c:AppBarStyle.TitleTextLabel>
+    <c:AppBarStyle.ActionButton>
+      <c:ButtonStyle>
+        <c:ButtonStyle.Text>
+          <TextLabelStyle>
+            <TextLabelStyle.TextColor>
+              <Selector x:TypeArguments="Color" Normal="#FF6200" Pressed="#FFA166" Focused="#FF7119" Disabled="#CACACA" />
+            </TextLabelStyle.TextColor>
+          </TextLabelStyle>
+        </c:ButtonStyle.Text>
+        <c:ButtonStyle.Icon>
+          <ImageViewStyle Color="#FDFDFD" />
+        </c:ButtonStyle.Icon>
+      </c:ButtonStyle>
+    </c:AppBarStyle.ActionButton>
+  </c:AppBarStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.Button">
+    <c:ButtonStyle.BackgroundColor>
+      <Selector x:TypeArguments="Color" Normal="#FF6200" Pressed="#FFA166" Focused="#FF721A" Selected="#F67C31" Disabled="#CACACA" />
+    </c:ButtonStyle.BackgroundColor>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle TextColor="#FDFDFD"/>
+    </c:ButtonStyle.Text>
+    <c:ButtonStyle.Icon>
+      <ImageViewStyle Color="#FDFDFD"/>
+    </c:ButtonStyle.Icon>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.Button.Outlined">
+    <c:ButtonStyle.BorderlineColorSelector>
+      <Selector x:TypeArguments="Color" Normal="#FF6200" Pressed="#FFA166" Focused="#FF7119" Selected="#FF8133" Disabled="#CACACA" />
+    </c:ButtonStyle.BorderlineColorSelector>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FF6200" Pressed="#FFA166" Focused="#FF7119" Selected="#FF8133" Disabled="#CACACA" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.Button.TextOnly">
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#FF6200" Pressed="#FFA166" Focused="#FF7119" Selected="#FF8133" Disabled="#CACACA" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.CheckBox">
+    <c:ButtonStyle.Icon>
         <ImageViewStyle>
           <ImageViewStyle.ResourceUrl>
               <Selector x:TypeArguments="x:String"
-                Normal="{NUIResourcePath IoT_radiobutton_off.png}"
-                Pressed="{NUIResourcePath IoT_radiobutton_off_p.png}"
-                Disabled="{NUIResourcePath IoT_radiobutton_off_d.png}"
-                Focused="{NUIResourcePath IoT_radiobutton_off_f.png}"
-                Selected="{NUIResourcePath IoT_radiobutton_on.png}"
-                SelectedPressed="{NUIResourcePath IoT_radiobutton_on_p.png}"
-                SelectedFocused="{NUIResourcePath IoT_radiobutton_on_f.png}"
-                DisabledSelected="{NUIResourcePath IoT_radiobutton_on_d.png}" />
+                Normal="{NUIResourcePath IoT_check_off.png}"
+                Disabled="{NUIResourcePath IoT_check_off_d.png}"
+                Focused="{NUIResourcePath IoT_check_off_f.png}"
+                Selected="{NUIResourcePath IoT_check_on.png}"
+                SelectedFocused="{NUIResourcePath IoT_check_on_f.png}"
+                DisabledSelected="{NUIResourcePath IoT_check_on_d.png}" />
           </ImageViewStyle.ResourceUrl>
         </ImageViewStyle>
-      </c:ButtonStyle.Icon>
-      <c:ButtonStyle.Text>
-          <TextLabelStyle
-            TextColor="#001447" />
-      </c:ButtonStyle.Text>
-    </c:ButtonStyle>
-
-    <c:SliderStyle x:Key="Tizen.NUI.Components.Slider">
-      <c:SliderStyle.Progress>
-          <ImageViewStyle
-            ResourceUrl="{NUIResourcePath IoT_slider_status_track.png}"
-            BackgroundColor="0.03, 0.05, 0.3, 1" />
-      </c:SliderStyle.Progress>
-      <c:SliderStyle.Thumb>
-          <ImageViewStyle
-            ResourceUrl="{NUIResourcePath IoT_slider_handler_normal.png}" />
-      </c:SliderStyle.Thumb>
-      <c:SliderStyle.ValueIndicatorImage>
-          <ImageViewStyle
-            BackgroundColor="0.0, 0.04, 0.16, 1.0" />
-      </c:SliderStyle.ValueIndicatorImage>
-    </c:SliderStyle>
-
-    <c:SwitchStyle x:Key="Tizen.NUI.Components.Switch">
-      <c:Switch.Track>
+    </c:ButtonStyle.Icon>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Selected="#FF6200" Disabled="#CACACA" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ButtonStyle x:Key="Tizen.NUI.Components.RadioButton">
+    <c:ButtonStyle.Icon>
+      <ImageViewStyle>
+        <ImageViewStyle.ResourceUrl>
+            <Selector x:TypeArguments="x:String"
+              Normal="{NUIResourcePath IoT_radiobutton_off.png}"
+              Pressed="{NUIResourcePath IoT_radiobutton_off.png}"
+              Disabled="{NUIResourcePath IoT_radiobutton_off_d.png}"
+              Focused="{NUIResourcePath IoT_radiobutton_off_f.png}"
+              Selected="{NUIResourcePath IoT_radiobutton_on.png}"
+              SelectedPressed="{NUIResourcePath IoT_radiobutton_on.png}"
+              SelectedFocused="{NUIResourcePath IoT_radiobutton_on_f.png}"
+              DisabledSelected="{NUIResourcePath IoT_radiobutton_on_d.png}" />
+        </ImageViewStyle.ResourceUrl>
+      </ImageViewStyle>
+    </c:ButtonStyle.Icon>
+    <c:ButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Selected="#FF6200" Disabled="#CACACA" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:ButtonStyle.Text>
+  </c:ButtonStyle>
+
+  <c:ProgressStyle x:Key="Tizen.NUI.Components.Progress"
+    IndeterminateImageUrl="{NUIResourcePath IoT_progress_indeterminate.png}">
+    <c:ProgressStyle.Track>
+      <ImageViewStyle BackgroundColor="#FFE6D6" />
+    </c:ProgressStyle.Track>
+    <c:ProgressStyle.Buffer>
+      <ImageViewStyle BackgroundColor="#FF6200" />
+    </c:ProgressStyle.Buffer>
+    <c:ProgressStyle.Progress>
+      <ImageViewStyle BackgroundColor="#FF6200" />
+    </c:ProgressStyle.Progress>
+  </c:ProgressStyle>
+
+  <c:SwitchStyle x:Key="Tizen.NUI.Components.Switch">
+    <c:SwitchStyle.Track>
+      <ImageViewStyle>
+        <ImageViewStyle.ResourceUrl>
+          <Selector x:TypeArguments="x:String"
+              Normal="{NUIResourcePath IoT_switch_track_off.png}"
+              Disabled="{NUIResourcePath IoT_switch_track_off_d.png}"
+              Focused="{NUIResourcePath IoT_switch_track_off_f.png}"
+              Selected="{NUIResourcePath IoT_switch_track_on.png}"
+              SelectedFocused="{NUIResourcePath IoT_switch_track_on_f.png}"
+              DisabledSelected="{NUIResourcePath IoT_switch_track_on_d.png}" />
+        </ImageViewStyle.ResourceUrl>
+      </ImageViewStyle>
+    </c:SwitchStyle.Track>
+    <c:SwitchStyle.Thumb>
         <ImageViewStyle>
           <ImageViewStyle.ResourceUrl>
             <Selector x:TypeArguments="x:String"
-                Normal="{NUIResourcePath IoT_switch_track_off.png}"
-                Pressed="{NUIResourcePath IoT_switch_track_off_p.png}"
-                Disabled="{NUIResourcePath IoT_switch_track_off_d.png}"
-                Focused="{NUIResourcePath IoT_switch_track_off_f.png}"
-                Selected="{NUIResourcePath IoT_switch_track_on.png}"
-                SelectedPressed="{NUIResourcePath IoT_switch_track_on_p.png}"
-                SelectedFocused="{NUIResourcePath IoT_switch_track_on_f.png}"
-                DisabledSelected="{NUIResourcePath IoT_switch_track_on_d.png}" />
+              Normal="{NUIResourcePath IoT_switch_thumb.png}"
+              Disabled="{NUIResourcePath IoT_switch_thumb_s.png}"
+              Selected="{NUIResourcePath IoT_switch_thumb_s.png}" />
           </ImageViewStyle.ResourceUrl>
         </ImageViewStyle>
-      </c:Switch.Track>
-      <c:Switch.Thumb>
-          <ImageViewStyle>
-            <ImageViewStyle.ResourceUrl>
-              <Selector x:TypeArguments="x:String"
-                Normal="{NUIResourcePath IoT_switch_thumb.png}"
-                Disabled="{NUIResourcePath IoT_switch_thumb_d.png}"
-                Selected="{NUIResourcePath IoT_switch_thumb_s.png}"
-                SelectedPressed="{NUIResourcePath IoT_switch_thumb_sp.png}"
-                SelectedFocused="{NUIResourcePath IoT_switch_thumb_sf.png}" />
-            </ImageViewStyle.ResourceUrl>
-          </ImageViewStyle>
-      </c:Switch.Thumb>
-      <c:Switch.Text>
-          <TextLabelStyle
-            TextColor="#001447" />
-      </c:Switch.Text>
-    </c:SwitchStyle>
-
-    <ViewStyle x:Key="Tizen.NUI.Components.ContentPage"
-      BackgroundColor="#EEEFF1" />
-
-    <c:AppBarStyle x:Key="Tizen.NUI.Components.AppBar"
-      BackgroundColor="#EEEFF1">
-      <c:AppBarStyle.BackButton>
-        <c:ButtonStyle>
-          <c:ButtonStyle.Icon>
-            <ImageViewStyle>
-              <ImageViewStyle.Color>
-                <Selector x:TypeArguments="Color"
-                  Normal="#0A0E4A"
-                  Focused="#00338B"
-                  Pressed="#1B69CA"
-                  Disabled="#C3CAD2" />
-              </ImageViewStyle.Color>
-            </ImageViewStyle>
-          </c:ButtonStyle.Icon>
-        </c:ButtonStyle>
-      </c:AppBarStyle.BackButton>
-      <c:AppBarStyle.TitleTextLabel>
-        <TextLabelStyle
-          TextColor="#000C2B"/>
-      </c:AppBarStyle.TitleTextLabel>
-      <c:AppBarStyle.ActionButton>
-        <c:ButtonStyle>
-          <c:ButtonStyle.Text>
-            <TextLabelStyle>
-              <TextLabelStyle.TextColor>
-                <Selector x:TypeArguments="Color"
-                  Normal="#0A0E4A"
-                  Focused="#00338B"
-                  Pressed="#1B69CA"
-                  Disabled="#C3CAD2" />
-              </TextLabelStyle.TextColor>
-            </TextLabelStyle>
-          </c:ButtonStyle.Text>
-          <c:ButtonStyle.Icon>
-            <ImageViewStyle>
-              <ImageViewStyle.Color>
-                <Selector x:TypeArguments="Color"
-                  Normal="#0A0E4A"
-                  Focused="#00338B"
-                  Pressed="#1B69CA"
-                  Disabled="#C3CAD2" />
-              </ImageViewStyle.Color>
-            </ImageViewStyle>
-          </c:ButtonStyle.Icon>
-        </c:ButtonStyle>
-      </c:AppBarStyle.ActionButton>
-    </c:AppBarStyle>
-
-    <TextLabelStyle x:Key="NotificationToast"
-      BackgroundColor="#F2F7FF"
-      TextColor="#000C2B" />
-
-    <c:AlertDialogStyle x:Key="Tizen.NUI.Components.AlertDialog"
-      BackgroundColor="White">
-      <c:AlertDialogStyle.TitleTextLabel>
-        <TextLabelStyle
-          TextColor="#000C2B" />
-      </c:AlertDialogStyle.TitleTextLabel>
-      <c:AlertDialogStyle.MessageTextLabel>
-        <TextLabelStyle
-          TextColor="#000C2B"/>
-      </c:AlertDialogStyle.MessageTextLabel>
-    </c:AlertDialogStyle>
+    </c:SwitchStyle.Thumb>
+    <c:SwitchStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Disabled="#CACACA" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:SwitchStyle.Text>
+  </c:SwitchStyle>
+
+  <c:LoadingStyle x:Key="Tizen.NUI.Components.Loading" LottieResourceUrl="{NUIResourcePath IoT_loading_circle_light.json}" />
+
+  <c:SliderStyle x:Key="Tizen.NUI.Components.Slider">
+    <c:SliderStyle.Track>
+        <ImageViewStyle BackgroundColor="#FFE6D6" />
+    </c:SliderStyle.Track>
+    <c:SliderStyle.Progress>
+        <ImageViewStyle>
+          <ImageViewStyle.BackgroundColor>
+            <Selector x:TypeArguments="Color" Normal="#FF6200" Disabled="#CACACA" />
+          </ImageViewStyle.BackgroundColor>
+        </ImageViewStyle>
+    </c:SliderStyle.Progress>
+    <c:SliderStyle.Thumb>
+      <ImageViewStyle>
+        <ImageViewStyle.ResourceUrl>
+          <Selector x:TypeArguments="x:String"
+            Normal="{NUIResourcePath IoT_slider_handler_normal.png}"
+            Pressed="{NUIResourcePath IoT_slider_handler_pressed.png}"
+            Disabled="{NUIResourcePath IoT_slider_handler_disabled.png}" />
+        </ImageViewStyle.ResourceUrl>
+      </ImageViewStyle>
+    </c:SliderStyle.Thumb>
+    <c:SliderStyle.ValueIndicatorImage>
+        <ImageViewStyle BorderlineColor="#FF6200" />
+    </c:SliderStyle.ValueIndicatorImage>
+    <c:SliderStyle.ValueIndicatorText>
+        <TextLabelStyle TextColor="#FF6200" />
+    </c:SliderStyle.ValueIndicatorText>
+  </c:SliderStyle>
+
+  <c:PaginationStyle x:Key="Tizen.NUI.Components.Pagination">
+    <c:PaginationStyle.IndicatorImageUrl>
+      <Selector x:TypeArguments="x:String"
+        Normal="{NUIResourcePath nui_component_default_pagination_normal_dot.png}"
+        Selected="{NUIResourcePath nui_component_default_pagination_focus_dot.png}" />
+    </c:PaginationStyle.IndicatorImageUrl>
+  </c:PaginationStyle>
+
+  <ViewStyle x:Key="Tizen.NUI.Components.TabBar" BackgroundColor="#FAFAFA" />
+
+  <c:TabButtonStyle x:Key="Tizen.NUI.Components.TabButton">
+    <c:TabButtonStyle.BackgroundColor>
+      <Selector x:TypeArguments="Color" Selected="#FFE0CC" Pressed="#FFCAA8" Other="#FAFAFA" />
+    </c:TabButtonStyle.BackgroundColor>
+    <c:TabButtonStyle.Text>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Disabled="#CACACA" Other="#FF6200" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:TabButtonStyle.Text>
+    <c:TabButtonStyle.Icon>
+      <ImageViewStyle>
+        <ImageViewStyle.Color>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Disabled="#CACACA" Other="#FF6200" />
+        </ImageViewStyle.Color>
+      </ImageViewStyle>
+    </c:TabButtonStyle.Icon>
+  </c:TabButtonStyle>
+
+  <c:AlertDialogStyle x:Key="Tizen.NUI.Components.AlertDialog" BackgroundColor="#FAFAFA" BoxShadow="8.0 | #00000029 | 0, 2">
+    <c:AlertDialogStyle.TitleTextLabel>
+      <TextLabelStyle TextColor="#090E21" />
+    </c:AlertDialogStyle.TitleTextLabel>
+    <c:AlertDialogStyle.MessageTextLabel>
+      <TextLabelStyle TextColor="#090E21"/>
+    </c:AlertDialogStyle.MessageTextLabel>
+  </c:AlertDialogStyle>
+
+  <TextLabelStyle x:Key="NotificationToast" BackgroundColor="#FAFAFA" TextColor="#090E21" BoxShadow="8.0 | #00000029 | 0, 2"/>
+
+  <c:TimePickerStyle x:Key="Tizen.NUI.Components.TimePicker">
+    <c:TimePickerStyle.Pickers>
+      <c:PickerStyle>
+        <c:PickerStyle.ItemTextLabel>
+          <TextLabelStyle BackgroundColor="#FAFAFA" TextColor="#090E21"/>
+        </c:PickerStyle.ItemTextLabel>
+      </c:PickerStyle>
+    </c:TimePickerStyle.Pickers>
+  </c:TimePickerStyle>
+
+  <c:DatePickerStyle x:Key="Tizen.NUI.Components.DatePicker">
+    <c:DatePickerStyle.Pickers>
+      <c:PickerStyle>
+        <c:PickerStyle.ItemTextLabel>
+          <TextLabelStyle BackgroundColor="#FAFAFA" TextColor="#090E21"/>
+        </c:PickerStyle.ItemTextLabel>
+      </c:PickerStyle>
+    </c:DatePickerStyle.Pickers>
+  </c:DatePickerStyle>
+
+  <c:DefaultLinearItemStyle x:Key="Tizen.NUI.Components.DefaultLinearItem">
+    <c:DefaultLinearItemStyle.Label>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Disabled="#CACACA" Other="#FF6200" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:DefaultLinearItemStyle.Label>
+    <c:DefaultLinearItemStyle.SubLabel>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Disabled="#CACACA" Other="#FF6200" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:DefaultLinearItemStyle.SubLabel>
+  </c:DefaultLinearItemStyle>
+
+  <c:DefaultGridItemStyle x:Key="Tizen.NUI.Components.DefaultGridItem" BoxShadow="12.0 | #00000029 | 0, 4">
+    <c:DefaultGridItemStyle.BackgroundColor>
+      <Selector x:TypeArguments="Color" Normal="#090E21" Pressed="#FAEEE6" Selected="#FBE2D2" Focused="#FAF4F0" Disabled="#FAFAFA" />
+    </c:DefaultGridItemStyle.BackgroundColor>
+    <c:DefaultGridItemStyle.Label>
+      <TextLabelStyle>
+        <TextLabelStyle.TextColor>
+          <Selector x:TypeArguments="Color" Normal="#090E21" Disabled="#CACACA" Other="#FF6200" />
+        </TextLabelStyle.TextColor>
+      </TextLabelStyle>
+    </c:DefaultGridItemStyle.Label>
+  </c:DefaultGridItemStyle>
 </Theme>
\ No newline at end of file

diff --git a/default_theme/light/shared/res/Tizen.NUI.Theme.xaml b/default_theme/light/shared/res/Tizen.NUI.Theme.xaml
index 512a045af427bc1f4473b4fcd0874f65d8cbad78..7a8e25687a71d9e0de8d032253cca836e174c7d6 100755 (executable)
--- a/default_theme/light/shared/res/Tizen.NUI.Theme.xaml
+++ b/default_theme/light/shared/res/Tizen.NUI.Theme.xaml
@@ -1,18 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Theme
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:c="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
   Id="org.tizen.default-light-theme"
   Version="1.0.0" >
+  
+  <TextLabelStyle x:Key="Tizen.NUI.BaseComponents.TextLabel"
+    TextColor="0.04, 0.05, 0.13, 1" />
 
-    <TextLabelStyle x:Key="Tizen.NUI.BaseComponents.TextLabel"
-      TextColor="0.00, 0.05, 0.17, 1" />
+  <TextFieldStyle x:Key="Tizen.NUI.BaseComponents.TextField"
+    TextColor="0.04, 0.05, 0.13, 1"
+    PlaceholderTextColor="0.79, 0.79, 0.79, 1"
+    PrimaryCursorColor="0.04, 0.05, 0.13, 1"
+    SecondaryCursorColor="0.04, 0.05, 0.13, 1"
+    SelectionHighlightColor="1, 0.63, 0.4, 0.3"
+    GrabHandleColor="0, 0, 0, 1" />
 
-    <TextFieldStyle x:Key="Tizen.NUI.BaseComponents.TextField"
-      TextColor="0.00, 0.05, 0.17, 1"
-      SelectionHighlightColor="0.17, 0.37, 0.72, 0.20" />
-
-    <TextEditorStyle x:Key="Tizen.NUI.BaseComponents.TextEditor"
-      TextColor="0.00, 0.05, 0.17, 1"
-      SelectionHighlightColor="0.17, 0.37, 0.72, 0.20" />
+  <TextEditorStyle x:Key="Tizen.NUI.BaseComponents.TextEditor"
+    TextColor="0.04, 0.05, 0.13, 1"
+    PlaceholderTextColor="0.79, 0.79, 0.79, 1"
+    PrimaryCursorColor="0.04, 0.05, 0.13, 1"
+    SecondaryCursorColor="0.04, 0.05, 0.13, 1"
+    SelectionHighlightColor="1, 0.63, 0.4, 0.3"
+    GrabHandleColor="0, 0, 0, 1" />
 </Theme>
\ No newline at end of file