Resolve Wrong look of info icon (white square visible), blue color visible under...

This Patch:
 - https://jira.sec.samsung.net/browse/TNINE-382

Change-Id: I50b90e3e7ad0359b2a84f4e8f73b5db4762b11a3
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 64804a6e9c354c0c76272437d3588116449c5a40..1301c0e300e0ef2b3d8e00e6139d591dfc43a412 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
+++ b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
@@ -45,7 +45,7 @@ namespace SettingBluetooth
             mBtDevice = btDevice;
             mRssi = btDevice.Rssi;
             string icon;
-            icon = "/images/bluetooth_icon.png";
+            icon = "/images/bluetooth_icon.svg";
             mIconDir = mResourcePath + icon;
         }
 
@@ -329,6 +329,7 @@ namespace SettingBluetooth
     {
         static CollectionView mDeviceView = null;
         static DeviceSource mDeviceSource = null;
+        private static bool isLightTheme => ThemeManager.PlatformThemeId == "org.tizen.default-light-theme";
 
         private static CollectionView CreateCollectionView(DeviceSource source, bool isPairedDeviceView = false)
         {
@@ -466,14 +467,14 @@ namespace SettingBluetooth
             {
                 IsSelectable = true,
                 CornerRadius = 50,
-                BackgroundColor = GetDefaultColorSelector(),
+                BackgroundColor = isLightTheme ? new Color("#FAFAFA") : new Color("#1D1A21"),
             };
 
             Button infoButton = new Button(style)
             {
                 WidthSpecification = buttonSize,
                 HeightSpecification = buttonSize,
-                IconURL = Resources.GetPath() + "/images/bluetooth_info_icon.png",
+                IconURL = Resources.GetPath() + "/images/bluetooth_info_icon.svg",
                 IsSelectable = false,
             };
 

diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon.png b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon.png
deleted file mode 100644 (file)
index 964f1f2..0000000
Binary files a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon.png and /dev/null differ

diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon.svg b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon.svg
new file mode 100644 (file)
index 0000000..c96dd75
--- /dev/null
+++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon.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="#17234D" stroke-width="2.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon.png b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon.png
deleted file mode 100644 (file)
index d4b03eb..0000000
Binary files a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon.png and /dev/null differ

diff --git a/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon.svg b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon.svg
new file mode 100644 (file)
index 0000000..adb669a
--- /dev/null
+++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon.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="#17234D" stroke-width="2"/>
+<path d="M14 12.5V19.5M14 11V9" stroke="#17234D" 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 2b77d477b1e03a707b29a44a11d7cfaa2114b105..b219a8f6193c55abe72700c435110fde53540ff6 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