Resolve DT Wrong bluetooth icons, info, color and look issues

This patch resolve following issues:
- DT Wrong look of icons bluetooth and info (https://jira.sec.samsung.net/browse/TNINE-411)
- DT Wrong look and color of toggle (https://jira.sec.samsung.net/browse/TNINE-356)

Change-Id: Ie03ee3d146fed7362b38237de370013b389006fa
Signed-off-by: Anuj Kumar Singh <anujk.singh@samsung.com>

diff --git a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
index ffe1b401bf4f242af18ca686e39b977ae7329e4d..b23660f12a71e93c7901f549e370f7e663b8e688 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
+++ b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
@@ -16,6 +16,7 @@ namespace SettingBluetooth
     {
         private string mResourcePath = Resources.GetPath();
         //private string mResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
+        private static bool isLightTheme => ThemeManager.PlatformThemeId == "org.tizen.default-light-theme";
         private string mIconDir;
         private string mAddress;
         private string mName;
@@ -45,7 +46,15 @@ namespace SettingBluetooth
             mBtDevice = btDevice;
             mRssi = btDevice.Rssi;
             string icon;
-            icon = "/images/bluetooth_icon.svg";
+            if (isLightTheme)
+            {
+                icon = "/images/bluetooth_icon.svg";
+            }
+            else
+            {
+                icon = "/images/bluetooth_icon_dark.svg";
+            }
+
             mIconDir = mResourcePath + icon;
         }
 
@@ -463,6 +472,7 @@ namespace SettingBluetooth
         internal static Button GetInfoButton()
         {
             int buttonSize = 25;
+            String icon;
 
             ButtonStyle style = new ButtonStyle()
             {
@@ -471,11 +481,20 @@ namespace SettingBluetooth
                 BackgroundColor = isLightTheme ? new Color("#FAFAFA") : new Color("#1D1A21"),
             };
 
+            if (isLightTheme)
+            {
+                icon = "/images/bluetooth_info_icon.svg";
+            }
+            else
+            {
+                icon = "/images/bluetooth_info_icon_dark.svg";
+            }
+
             Button infoButton = new Button(style)
             {
                 WidthSpecification = buttonSize,
                 HeightSpecification = buttonSize,
-                IconURL = Resources.GetPath() + "/images/bluetooth_info_icon.svg",
+                IconURL = Resources.GetPath() + icon,
                 IsSelectable = false,
             };
 

diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon_dark.svg b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon_dark.svg
new file mode 100644 (file)
index 0000000..916bb37
--- /dev/null
+++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon_dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="24" viewBox="0 0 16 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 7L14 17L8 22V2L14 7L2 17" stroke="#FF8A00" stroke-width="2.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon_dark.svg b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon_dark.svg
new file mode 100644 (file)
index 0000000..05b9433
--- /dev/null
+++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon_dark.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="14" cy="14" r="11" stroke="#FF8A00" stroke-width="2"/>
+<path d="M14 12.5V19.5M14 11V9" stroke="#FF8A00" stroke-width="2"/>
+</svg>

diff --git a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk
index aac274abeba6f40c7d6b8356afdfdeef133cda66..d9f1a0e788a2e0cb842f20b20d87eb1a062b87ae 100644 (file)
Binary files a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk and b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk differ