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 <anujk.singh@samsung.com>

diff --git a/SettingWiFi/SettingWiFi/model/AP.cs b/SettingWiFi/SettingWiFi/model/AP.cs
index 3c458c2d8f2c6dc4f0b1aeeb26dd923d2368d0a8..a00374ceed6ab4c9ba8ec8b9d22fd603018b3211 100755 (executable)
--- a/SettingWiFi/SettingWiFi/model/AP.cs
+++ b/SettingWiFi/SettingWiFi/model/AP.cs
@@ -10,6 +10,7 @@ using Tizen.Network.WiFi;
 using Tizen.Network.Connection;\r
 //using SettingWiFi.res.locale;\r
 using static SettingWiFi.Logger;\r
+using Tizen.NUI;\r
 \r
 \r
 namespace SettingWiFi\r
@@ -33,6 +34,7 @@ namespace SettingWiFi
         private SignalStrengthIndicator signalStrength = SignalStrengthIndicator.UNKNOWN;\r
 \r
         public event PropertyChangedEventHandler PropertyChanged;\r
+        private bool isLightTheme => IsLightTheme();\r
 \r
         private void OnPropertyChanged(string propertyName)\r
         {\r
@@ -40,6 +42,11 @@ namespace SettingWiFi
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));\r
         }\r
 \r
+        internal bool IsLightTheme()\r
+        {\r
+            return ThemeManager.PlatformThemeId == ThemeManager.DefaultLightThemeName;\r
+        }\r
+\r
         private SignalStrengthIndicator ConvertToSignalStrength(WiFiRssiLevel wifiRssiLevel)\r
         {\r
             Debug("ConvertToRssiLevel");\r
@@ -61,7 +68,15 @@ namespace SettingWiFi
 \r
         private void UpdateWiFiAPIcon()\r
         {\r
-            string iconName = "wifi-ap_icon_";\r
+            string iconName;\r
+            if (isLightTheme)\r
+            {\r
+                iconName = "wifi-ap_icon_";\r
+            }\r
+            else\r
+            {\r
+                iconName = "wifi-ap_icon_dt_";\r
+            }\r
 \r
             switch (signalStrength)\r
             {\r
@@ -91,7 +106,15 @@ namespace SettingWiFi
 \r
             if (secType != WiFiSecurityType.None)\r
             {\r
-                string iconName = "wifi-ap_lock_icon.png";\r
+                string iconName;\r
+                if (isLightTheme)\r
+                {\r
+                    iconName = "wifi-ap_lock_icon.png";\r
+                }\r
+                else\r
+                {\r
+                    iconName = "wifi-ap_lock_icon_dt.png";\r
+                }\r
                 infoIconDir = Resources.GetPath() + "/images/" + iconName;\r
             }\r
         }\r

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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index 0000000..254a9f8
--- /dev/null
+++ b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi_icon_info_dt.svg
@@ -0,0 +1,21 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2083_7058)">
+<g clip-path="url(#clip1_2083_7058)">
+<g clip-path="url(#clip2_2083_7058)">
+<circle cx="16" cy="16" r="11" stroke="#FF8A00" stroke-width="2"/>
+<path d="M16 14.5V21.5M16 13V11" stroke="#FF8A00" stroke-width="2"/>
+</g>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_2083_7058">
+<rect width="32" height="32" rx="8" fill="white"/>
+</clipPath>
+<clipPath id="clip1_2083_7058">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+<clipPath id="clip2_2083_7058">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

diff --git a/SettingWiFi/SettingWiFi/tizen-manifest.xml b/SettingWiFi/SettingWiFi/tizen-manifest.xml
index 872978b8a7ad4fcb4a0f565d26b0e2a42cd90f96..6c905f59f87711dfd1baa72a20422b965ee8e238 100755 (executable)
--- a/SettingWiFi/SettingWiFi/tizen-manifest.xml
+++ b/SettingWiFi/SettingWiFi/tizen-manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="6.5"
-  package="org.tizen.cssetting-wifi" version="1.1.5"
+  package="org.tizen.cssetting-wifi" version="1.1.6"
   res-type="org.tizen.appfw.gadget.setting-wifi" res-version="1.5.0">
        <allowed-package id="org.tizen.*">
                <required-privileges>

diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs
index d2d6656d98d3557caa114994169f1753ccabcce0..51f2ea82c65b80f937a9a1d56b80d91facdd3a65 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/MainPage.cs
+++ b/SettingWiFi/SettingWiFi/view/MainPage.cs
@@ -233,7 +233,7 @@ namespace SettingWiFi
         {
             return new Selector<Color>()
             {
-                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 (file)
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 (file)
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 d371963ccad08fec886bf6c01dae896f0660dd59..7bea5233315ee46428af3bc6799aae0453300f38 100644 (file)
--- 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