From: Anuj Kumar Singh Date: Tue, 26 Dec 2023 09:36:26 +0000 (+0530) Subject: Resolve Wrong look of info icon (white square visible), blue color visible under... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F303362%2F1;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-bluetooth.git Resolve Wrong look of info icon (white square visible), blue color visible under icon issue This Patch: - https://jira.sec.samsung.net/browse/TNINE-382 Change-Id: I50b90e3e7ad0359b2a84f4e8f73b5db4762b11a3 Signed-off-by: Anuj Kumar Singh --- diff --git a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs index 64804a6..1301c0e 100644 --- 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 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 index 0000000..c96dd75 --- /dev/null +++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon.svg @@ -0,0 +1,3 @@ + + + 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 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 index 0000000..adb669a --- /dev/null +++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk index ac1914a..aff0dea 100644 Binary files a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk and b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk differ