Resolve wrong wifi and info icon issue

This patch:
 - resolves https://code.sec.samsung.net/jira/browse/TEIGHT-5155
 - Updates rpk version from 1.1.4 to 1.1.5

Change-Id: Ie708a61bacae685e10533c5071d53b1f4235d1b4
Signed-off-by: Akash Kumar <akash1.kumar@samsung.com>

diff --git a/SettingWiFi/SettingWiFi/model/AP.cs b/SettingWiFi/SettingWiFi/model/AP.cs
index cc923634dbbafa783fb07b5a346c606f10ecf41b..5a6b954ad5b4d5f190546d6a0e085f8ffee646a1 100755 (executable)
--- a/SettingWiFi/SettingWiFi/model/AP.cs
+++ b/SettingWiFi/SettingWiFi/model/AP.cs
@@ -24,6 +24,7 @@ namespace SettingWiFi
             UNKNOWN,\r
         }\r
         string iconDir;\r
+        string infoIconDir;\r
         private string essid;\r
         private WiFiState state;\r
         private string stateInfo;\r
@@ -62,11 +63,6 @@ namespace SettingWiFi
         {\r
             string iconName = "wifi-ap_icon_";\r
 \r
-            if (secType != WiFiSecurityType.None)\r
-            {\r
-                iconName += "lock_";\r
-            }\r
-\r
             switch (signalStrength)\r
             {\r
                 case SignalStrengthIndicator.EXCELLENT:\r
@@ -87,9 +83,17 @@ namespace SettingWiFi
 \r
             iconName += ".png";\r
             iconDir = Resources.GetPath() + "/images/" + iconName;\r
+        }\r
 \r
-            Debug("Signal: " + signalStrength.ToString()\r
-                + ", IconDir: " + iconDir); // TODO: will be removed.\r
+\r
+        private void UpdateWiFiAPInfoIcon()\r
+        {\r
+\r
+            if (secType != WiFiSecurityType.None)\r
+            {\r
+                string iconName = "wifi-ap_lock_icon.png";\r
+                infoIconDir = Resources.GetPath() + "/images/" + iconName;\r
+            }\r
         }\r
 \r
         public AP()\r
@@ -103,6 +107,7 @@ namespace SettingWiFi
             StateInfo = GetStateInfo(state);\r
             signalStrength = SignalStrengthIndicator.UNKNOWN;\r
             UpdateWiFiAPIcon();\r
+            UpdateWiFiAPInfoIcon();\r
         }\r
 \r
         public AP(WiFiAP apHandle, string apEssid, WiFiState apState,\r
@@ -118,6 +123,7 @@ namespace SettingWiFi
             StateInfo = GetStateInfo(state);\r
             signalStrength = ConvertToSignalStrength(apRssiLevel);\r
             UpdateWiFiAPIcon();\r
+            UpdateWiFiAPInfoIcon();\r
         }\r
 \r
         public WiFiAP ApHandle\r
@@ -209,6 +215,14 @@ namespace SettingWiFi
             }\r
         }\r
 \r
+        public string InfoImageUrl\r
+        {\r
+            get\r
+            {\r
+                return infoIconDir;\r
+            }\r
+        }\r
+\r
         public string StateInfo\r
         {\r
             get\r

diff --git a/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_lock_icon.png b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_lock_icon.png
new file mode 100644 (file)
index 0000000..973f41e
Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/allowed/SettingWiFi/images/wifi-ap_lock_icon.png differ

diff --git a/SettingWiFi/SettingWiFi/tizen-manifest.xml b/SettingWiFi/SettingWiFi/tizen-manifest.xml
index 6943aa0533c537f8ea4bd14fd3bf1d0d6ea07bc4..d44e73a49171d8a88cd1adb13bca4d417d079004 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.4"
+  package="org.tizen.cssetting-wifi" version="1.1.5"
   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 ee8a5b95a28c0047fa2f945ad9523bca5c951210..1b59dad082a0606bab795964b4e383b7ea146d83 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/MainPage.cs
+++ b/SettingWiFi/SettingWiFi/view/MainPage.cs
@@ -239,9 +239,28 @@ namespace SettingWiFi
             return icon;
         }
 
+        private View GetExtraInfoView()
+        {
+            View infoView = new View()
+            {
+                Layout = new LinearLayout()
+                {
+                    LinearOrientation = LinearLayout.Orientation.Horizontal,
+                },
+            };
+
+            ImageView icon = new ImageView();
+            icon.SetBinding(ImageView.ResourceUrlProperty, "InfoImageUrl");
+            icon.WidthSpecification = 32;
+            icon.HeightSpecification = 32;
+            infoView.Add(icon);
+            infoView.Add(GetInfoButton());
+            return infoView;
+        }
+
         private Button GetInfoButton()
         {
-            int buttonSize = 25;
+            int buttonSize = 32;
 
             ButtonStyle style = new ButtonStyle()
             {
@@ -279,9 +298,8 @@ namespace SettingWiFi
                 item.SubLabel.HorizontalAlignment = HorizontalAlignment.Begin;
 
                 item.Icon = GetApIconImageView();
-                item.Extra = GetInfoButton();
+                item.Extra = GetExtraInfoView();
                 item.IsSelectable = false;
-                //OnAppClicked not working as expected as of now. Need to popup contentpage when clicked
                 item.Clicked += OnAPClicked;
                 return item;
             });

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.4.rpk b/packaging/org.tizen.cssetting-wifi-1.1.4.rpk
deleted file mode 100644 (file)
index af529c6..0000000
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.4.rpk and /dev/null differ

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.5.rpk b/packaging/org.tizen.cssetting-wifi-1.1.5.rpk
new file mode 100644 (file)
index 0000000..c6693a1
Binary files /dev/null and b/packaging/org.tizen.cssetting-wifi-1.1.5.rpk differ

diff --git a/packaging/org.tizen.setting-wifi.spec b/packaging/org.tizen.setting-wifi.spec
index b90c9d6d53f70535a377d8a616a13b7687f360a2..d371963ccad08fec886bf6c01dae896f0660dd59 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.4
+Version:       1.1.5
 Release:       1
 Provides:      org.tizen.setting-wifi = %{version}-%{release}
 Group:         Applications/Security