From: Anuj Kumar Singh Date: Wed, 21 Feb 2024 04:34:53 +0000 (+0530) Subject: Fix WiFi Dark mode wrong color of wi-fi icon, lock icon, info icon isssue X-Git-Tag: accepted/tizen/unified/20240227.173432^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0487d2cf8fde1bccab56c3c96de729063510de8;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git Fix WiFi Dark mode wrong color of wi-fi icon, lock icon, info icon isssue and Update version 1.1.6 rpk and remove older version of rpk This patch: - Resolve https://jira.sec.samsung.net/browse/TNINE-354 Change-Id: I85136965e7043a15e6997213db3f1788a3b43493 Signed-off-by: Anuj Kumar Singh --- diff --git a/SettingWiFi/SettingWiFi/model/AP.cs b/SettingWiFi/SettingWiFi/model/AP.cs index 3c458c2..a00374c 100755 --- a/SettingWiFi/SettingWiFi/model/AP.cs +++ b/SettingWiFi/SettingWiFi/model/AP.cs @@ -10,6 +10,7 @@ using Tizen.Network.WiFi; using Tizen.Network.Connection; //using SettingWiFi.res.locale; using static SettingWiFi.Logger; +using Tizen.NUI; namespace SettingWiFi @@ -33,6 +34,7 @@ namespace SettingWiFi private SignalStrengthIndicator signalStrength = SignalStrengthIndicator.UNKNOWN; public event PropertyChangedEventHandler PropertyChanged; + private bool isLightTheme => IsLightTheme(); private void OnPropertyChanged(string propertyName) { @@ -40,6 +42,11 @@ namespace SettingWiFi PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } + internal bool IsLightTheme() + { + return ThemeManager.PlatformThemeId == ThemeManager.DefaultLightThemeName; + } + private SignalStrengthIndicator ConvertToSignalStrength(WiFiRssiLevel wifiRssiLevel) { Debug("ConvertToRssiLevel"); @@ -61,7 +68,15 @@ namespace SettingWiFi private void UpdateWiFiAPIcon() { - string iconName = "wifi-ap_icon_"; + string iconName; + if (isLightTheme) + { + iconName = "wifi-ap_icon_"; + } + else + { + iconName = "wifi-ap_icon_dt_"; + } switch (signalStrength) { @@ -91,7 +106,15 @@ namespace SettingWiFi if (secType != WiFiSecurityType.None) { - string iconName = "wifi-ap_lock_icon.png"; + string iconName; + if (isLightTheme) + { + iconName = "wifi-ap_lock_icon.png"; + } + else + { + iconName = "wifi-ap_lock_icon_dt.png"; + } infoIconDir = Resources.GetPath() + "/images/" + iconName; } } diff --git a/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_00.png b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_00.png new file mode 100644 index 0000000..4c4f5f3 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_00.png differ diff --git a/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_01.png b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_01.png new file mode 100644 index 0000000..7ac39d8 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_01.png differ diff --git a/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_02.png b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_02.png new file mode 100644 index 0000000..144eac9 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_02.png differ diff --git a/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_03.png b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_03.png new file mode 100644 index 0000000..c745228 Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_icon_dt_03.png differ diff --git a/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_lock_icon_dt.png b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_lock_icon_dt.png new file mode 100644 index 0000000..55b335b Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_lock_icon_dt.png differ diff --git a/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi_icon_info_dt.svg b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi_icon_info_dt.svg new file mode 100644 index 0000000..254a9f8 --- /dev/null +++ b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi_icon_info_dt.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/SettingWiFi/SettingWiFi/tizen-manifest.xml b/SettingWiFi/SettingWiFi/tizen-manifest.xml index 872978b..6c905f5 100755 --- a/SettingWiFi/SettingWiFi/tizen-manifest.xml +++ b/SettingWiFi/SettingWiFi/tizen-manifest.xml @@ -1,6 +1,6 @@  diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs index d2d6656..51f2ea8 100755 --- a/SettingWiFi/SettingWiFi/view/MainPage.cs +++ b/SettingWiFi/SettingWiFi/view/MainPage.cs @@ -233,7 +233,7 @@ namespace SettingWiFi { return new Selector() { - Normal = new Color("#17234D"), + Normal = isLightTheme ? new Color("#17234D") : new Color("#FFFFFF"), Focused = new Color("#17234D"), Pressed = new Color("#FF6200"), Disabled = new Color("#CACACA"), @@ -249,8 +249,8 @@ namespace SettingWiFi ImageView icon = new ImageView(style); icon.SetBinding(ImageView.ResourceUrlProperty, "ImageUrl"); - icon.WidthSpecification = 40; - icon.HeightSpecification = 40; + icon.WidthSpecification = 32; + icon.HeightSpecification = 32; return icon; } @@ -284,11 +284,21 @@ namespace SettingWiFi BackgroundColor = isLightTheme ? new Color("#FAFAFA") : new Color("#1D1A21"), }; + string icon; + if (isLightTheme) + { + icon = "/images/wifi_icon_info.svg"; + } + else + { + icon = "/images/wifi_icon_info_dt.svg"; + } + Button infoButton = new Button(style) { WidthSpecification = buttonSize, HeightSpecification = buttonSize, - IconURL = Resources.GetPath() + "/images/wifi_icon_info.svg", + IconURL = Resources.GetPath() + icon, IsSelectable = false, }; diff --git a/packaging/org.tizen.cssetting-wifi-1.1.5.rpk b/packaging/org.tizen.cssetting-wifi-1.1.5.rpk deleted file mode 100644 index 592ac14..0000000 Binary files a/packaging/org.tizen.cssetting-wifi-1.1.5.rpk and /dev/null differ diff --git a/packaging/org.tizen.cssetting-wifi-1.1.6.rpk b/packaging/org.tizen.cssetting-wifi-1.1.6.rpk new file mode 100644 index 0000000..65e40ff Binary files /dev/null and b/packaging/org.tizen.cssetting-wifi-1.1.6.rpk differ diff --git a/packaging/org.tizen.setting-wifi.spec b/packaging/org.tizen.setting-wifi.spec index d371963..7bea523 100644 --- a/packaging/org.tizen.setting-wifi.spec +++ b/packaging/org.tizen.setting-wifi.spec @@ -1,6 +1,6 @@ Name: org.tizen.setting-wifi summary: NUI wifi setting application -Version: 1.1.5 +Version: 1.1.6 Release: 1 Provides: org.tizen.setting-wifi = %{version}-%{release} Group: Applications/Security