Update AP and AP info icon

Change-Id: Ibea5c780713afa9e07ae35d7c55958535fea9a2e

diff --git a/SettingWiFi/SettingWiFi/res/images/wifi_icon_badge_container.png b/SettingWiFi/SettingWiFi/res/images/wifi_icon_badge_container.png
new file mode 100644 (file)
index 0000000..405e1b6
Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/images/wifi_icon_badge_container.png differ

diff --git a/SettingWiFi/SettingWiFi/res/images/wifi_icon_badge_info.png b/SettingWiFi/SettingWiFi/res/images/wifi_icon_badge_info.png
new file mode 100644 (file)
index 0000000..6b2dd79
Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/images/wifi_icon_badge_info.png differ

diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs
index 27748676424a272ee28fcf50e296e1854a6512e1..e4891c46cf8380bf6e773361ff8e0a32c2df8e97 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/MainPage.cs
+++ b/SettingWiFi/SettingWiFi/view/MainPage.cs
@@ -20,6 +20,7 @@ namespace SettingWiFi
         WiFi mWifi;
         APSource mApSource;
 
+        private static readonly string mImagePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/";
         private static readonly int itemCount = 1;
         private MenuItem[] menuItems = new MenuItem[itemCount];
 
@@ -130,6 +131,54 @@ namespace SettingWiFi
             mApSource.UpdateApState(e.Bssid, e.State);
         }
 
+        private Selector<Color> GetDefaultColorSelector()
+        {
+            return new Selector<Color>()
+            {
+                Normal = new Color("#17234D"),
+                Focused = new Color("#17234D"),
+                Pressed = new Color("#FF6200"),
+                Disabled = new Color("#CACACA"),
+            };
+        }
+
+        private ImageView GetApIconImageView()
+        {
+            ImageViewStyle style = new ImageViewStyle() {
+                Color = GetDefaultColorSelector(),
+            };
+
+            ImageView icon = new ImageView(style);
+            icon.SetBinding(ImageView.ResourceUrlProperty, "ImageUrl");
+            icon.WidthSpecification = 40;
+            icon.HeightSpecification = 40;
+            return icon;
+        }
+
+        private Button GetInfoButton()
+        {
+            int buttonSize = 25;
+
+            ButtonStyle style = new ButtonStyle() {
+                IsSelectable = true,
+                CornerRadius = 50,
+                BackgroundColor = GetDefaultColorSelector(),
+            };
+
+            Button infoButton = new Button(style)
+            {
+                WidthSpecification = buttonSize,
+                HeightSpecification = buttonSize,
+                IconURL = mImagePath + "wifi_icon_badge_info.png",
+            };
+
+            infoButton.Icon.WidthSpecification = buttonSize;
+            infoButton.Icon.HeightSpecification = buttonSize;
+            infoButton.Clicked += OnInfoClicked;
+
+            return infoButton;
+        }
+
         private DataTemplate CreateItemTemplate()
         {
             return new DataTemplate(() =>
@@ -143,31 +192,8 @@ namespace SettingWiFi
                     item.SubLabel.SetBinding(TextLabel.TextProperty, "StateInfo");
                     item.SubLabel.HorizontalAlignment = HorizontalAlignment.Begin;
 
-                    ImageViewStyle imageViewStyle = new ImageViewStyle()
-                    {
-                        Color = new Selector<Color>()
-                        {
-                            Normal = new Color("#17234D"),
-                            Focused = new Color("#17234D"),
-                            Pressed = new Color("#FF6200"),
-                            Disabled = new Color("#CACACA"),
-                        },
-                    };
-
-                    item.Icon = new ImageView(imageViewStyle);
-                    item.Icon.SetBinding(ImageView.ResourceUrlProperty, "ImageUrl");
-                    item.Icon.WidthSpecification = 40;
-                    item.Icon.HeightSpecification = 40;
-
-                    var infoButton = new Button()
-                    {
-                        Text = "i",
-                        WidthSpecification = 40,
-                        HeightSpecification = 40,
-                    };
-                    //infoButton.Icon.SetBinding(ImageView.ResourceUrlProperty, "InfoImageUrl");
-                    infoButton.Clicked += OnInfoClicked;
-                    item.Extra = infoButton;
+                    item.Icon = GetApIconImageView();
+                    item.Extra = GetInfoButton();
 
                     return item;
                 });