From: Anuj Kumar Singh Date: Tue, 9 Jan 2024 08:11:19 +0000 (+0530) Subject: Resolve DT Wrong bluetooth icons, info, color and look issues X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_8.0;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-bluetooth.git 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 --- diff --git a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs index ffe1b40..b23660f 100644 --- 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 index 0000000..916bb37 --- /dev/null +++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_icon_dark.svg @@ -0,0 +1,3 @@ + + + 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 index 0000000..05b9433 --- /dev/null +++ b/SettingBluetooth/SettingBluetooth/res/allowed/SettingBluetooth/images/bluetooth_info_icon_dark.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 74087c4..37c2ccb 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