Resolve DT Wi-fi network info wrong look of proxy adresss

and proxy port input, wrong look of forget button issue

This patch:
 - Resolve https://jira.sec.samsung.net/browse/TNINE-407

Change-Id: Ie209d302678eab14cf9f5dde792cbccce817c1f7
Signed-off-by: Sameer Kumar <sameer.kumar@samsung.com>

diff --git a/SettingWiFi/SettingWiFi/view/InfoItem.cs b/SettingWiFi/SettingWiFi/view/InfoItem.cs
index 7d5469660ab0951f80782484dec4175d80b5de29..59faa61cc9fb3fa62fd996c60179bc04ad3d07f9 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/InfoItem.cs
+++ b/SettingWiFi/SettingWiFi/view/InfoItem.cs
@@ -76,7 +76,7 @@ namespace SettingWiFi
                 {
                     WidthSpecification = LayoutParamPolicies.MatchParent,
                     HeightSpecification = 48,
-                    BackgroundColor = Color.White,
+                    BackgroundColor = new Color(ThemeManager.PlatformThemeId == "org.tizen.default-light-theme" ? Color.White : new Color("#1D1A21")),
                     PlaceholderText = curvalue,
                     Padding = new Extents(16, 16, 0, 0).SpToPx(),
                 };

diff --git a/SettingWiFi/SettingWiFi/view/InfoPage.cs b/SettingWiFi/SettingWiFi/view/InfoPage.cs
index d515d4a055cebaadbe2b9437e8e3e7da40a60347..48325dd203355952108052d96552221e94bf08d5 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/InfoPage.cs
+++ b/SettingWiFi/SettingWiFi/view/InfoPage.cs
@@ -59,20 +59,6 @@ namespace SettingWiFi
             AddHeader();
             AddInfo();
 
-            var forgetButton = new Button()
-            {
-                Text = Resources.IDS_WIFI_SK_FORGET,
-                WidthSpecification = 252,
-                HeightSpecification = 48,
-                BackgroundColor = Color.White,
-                TextColor = new Color("#FF6200"),
-                BorderlineColor = new Color("#FF6200"),
-                BorderlineWidth = 2,
-            };
-
-            forgetButton.Clicked += OnForgetClicked;
-            mInfoView.Add(forgetButton);
-
             AppBar = CreateAppBar();
             Content = mInfoView;
         }
@@ -88,6 +74,14 @@ namespace SettingWiFi
 
             backButton.Clicked += OnBackClicked;
             appBar.NavigationContent = backButton;
+            Button mForgetButton = new Button()
+            {
+                Text = Resources.IDS_WIFI_SK_FORGET,
+            };
+            mForgetButton.Clicked += OnForgetClicked;
+            mForgetButton.TextColor = new Color(ThemeManager.PlatformThemeId == "org.tizen.default-light-theme" ? "#FF6200" : "#FF8A00");
+            mForgetButton.BackgroundColor = new Color(ThemeManager.PlatformThemeId == "org.tizen.default-light-theme" ? new Color("#FAFAFA") : Color.Black);
+            appBar.Add(mForgetButton);
             return appBar;
         }
 

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.5.rpk b/packaging/org.tizen.cssetting-wifi-1.1.5.rpk
index c2e369b8d23fb63e3d1a261f6b71e49e0017f460..0dc04f6a6ac23397c0a9c08800c06568db875ae7 100644 (file)
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.5.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.5.rpk differ