From d46daac97a70a00b794389d7dcdcadd71a1cacf5 Mon Sep 17 00:00:00 2001 From: "k.stepaniuk" Date: Wed, 1 Apr 2020 16:10:32 +0200 Subject: [PATCH] Handling AP connection state & UI lifting Signed-off-by: k.stepaniuk --- Oobe/OobeCommon/Styles/ButtonStyles.cs | 61 +---------- Oobe/OobeWifi/Controls/Wifi/ApView.cs | 5 +- Oobe/OobeWifi/Controls/Wifi/ButtonStyles.cs | 120 ++++++++++++++++++++++ Oobe/OobeWifi/Controls/Wifi/FontStyles.cs | 29 ++++++ Oobe/OobeWifi/Controls/Wifi/WifiPasswordPopup.cs | 51 ++++----- Oobe/OobeWifi/Controls/Wifi/WifiView.cs | 3 +- Oobe/OobeWifi/WifiStep.cs | 7 +- Oobe/OobeWifi/res/12_icon_addnetwork.svg | 1 - Oobe/OobeWifi/res/12_icon_eye_pw_hidden.png | Bin 623 -> 1283 bytes Oobe/OobeWifi/res/12_icon_eye_pw_hidden.svg | 1 - Oobe/OobeWifi/res/12_icon_eye_pw_visible.png | Bin 628 -> 1176 bytes Oobe/OobeWifi/res/12_icon_eye_pw_visible.svg | 1 - Oobe/OobeWifi/res/12_icon_scan.svg | 1 - Oobe/OobeWifi/res/12_icon_wifi.svg | 1 - Oobe/OobeWifi/res/12_icon_wifioff.svg | 1 - Oobe/OobeWifi/res/12_icon_wifion.svg | 1 - Oobe/OobeWifi/res/Line_94.svg | 1 - Oobe/OobeWifi/res/Rectangle_918.svg | 1 - Oobe/OobeWifi/res/small12_icon_eye_pw_hidden.png | Bin 0 -> 623 bytes Oobe/OobeWifi/res/small12_icon_eye_pw_visible.png | Bin 0 -> 628 bytes 20 files changed, 184 insertions(+), 101 deletions(-) create mode 100644 Oobe/OobeWifi/Controls/Wifi/ButtonStyles.cs create mode 100644 Oobe/OobeWifi/Controls/Wifi/FontStyles.cs delete mode 100644 Oobe/OobeWifi/res/12_icon_addnetwork.svg delete mode 100644 Oobe/OobeWifi/res/12_icon_eye_pw_hidden.svg delete mode 100644 Oobe/OobeWifi/res/12_icon_eye_pw_visible.svg delete mode 100644 Oobe/OobeWifi/res/12_icon_scan.svg delete mode 100644 Oobe/OobeWifi/res/12_icon_wifi.svg delete mode 100644 Oobe/OobeWifi/res/12_icon_wifioff.svg delete mode 100644 Oobe/OobeWifi/res/12_icon_wifion.svg delete mode 100644 Oobe/OobeWifi/res/Line_94.svg delete mode 100644 Oobe/OobeWifi/res/Rectangle_918.svg create mode 100644 Oobe/OobeWifi/res/small12_icon_eye_pw_hidden.png create mode 100644 Oobe/OobeWifi/res/small12_icon_eye_pw_visible.png diff --git a/Oobe/OobeCommon/Styles/ButtonStyles.cs b/Oobe/OobeCommon/Styles/ButtonStyles.cs index dbed457..ac490b0 100644 --- a/Oobe/OobeCommon/Styles/ButtonStyles.cs +++ b/Oobe/OobeCommon/Styles/ButtonStyles.cs @@ -9,11 +9,7 @@ namespace Oobe.Common.Styles public static ButtonStyle Next = GetNextButtonStyle(); public static ButtonStyle Previous = GetPreviousButtonStyle(); public static ButtonStyle Skip = GetSkipButtonStyle(); - public static ButtonStyle OK = GetOKButtonStyle(); - public static ButtonStyle Cancel = GetCancelButtonStyle(); - public static ButtonStyle Scan = GetScanButtonStyle(); - public static ButtonStyle TurnOnOff = GetTurnOnOffButtonStyle(); - public static ButtonStyle Reveal = GetRevealButtonStyle(); + private static ButtonStyle GetPreviousButtonStyle() => new ButtonStyle { BackgroundImage = new Selector @@ -41,51 +37,6 @@ namespace Oobe.Common.Styles Size2D = new Size2D(240, 72), }; - private static ButtonStyle GetCancelButtonStyle() - { - var style = GetPreviousButtonStyle(); - style.Text.Text = "CANCEL"; - return style; - } - private static ButtonStyle GetScanButtonStyle() => new ButtonStyle - { - BackgroundImage = new Selector - { - Normal = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_scan.png", - Pressed = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_scan_pressed.png", - Disabled = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_scan_disabled.png", - }, - Size2D = new Size2D(72, 32), - }; - private static ButtonStyle GetTurnOnOffButtonStyle() => new ButtonStyle - { - BackgroundImage = new Selector - { - Normal = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifioff.png", - Disabled = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifioff_disabled.png", - Selected = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifion.png", - DisabledSelected = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifion_disabled.png", - }, - Size2D = new Size2D(72, 32), - }; - public static ButtonStyle AddNetwork = GetAddNetworkButtonStyle(); - private static ButtonStyle GetAddNetworkButtonStyle() => new ButtonStyle - { - BackgroundImage = new Selector - { - Normal = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_addnetwork.png", - Pressed = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_addnetwork_pressed.png", - }, - Size2D = new Size2D(42, 42), - }; - - private static ButtonStyle GetOKButtonStyle() - { - var style = GetNextButtonStyle(); - style.Text.Text = "OK"; - return style; - } - private static ButtonStyle GetSkipButtonStyle() { var style = GetNextButtonStyle(); @@ -115,16 +66,6 @@ namespace Oobe.Common.Styles Size2D = new Size2D(240, 72), }; - private static ButtonStyle GetRevealButtonStyle() => new ButtonStyle - { - BackgroundImage = new Selector - { - Normal = System.IO.Path.Combine(NUIApplication.Current.DirectoryInfo.Resource, "12_icon_eye_pw_hidden.png"), - Selected = System.IO.Path.Combine(NUIApplication.Current.DirectoryInfo.Resource, "12_icon_eye_pw_visible.png"), - }, - Size2D = new Size2D(72, 32), - }; - private static Selector GetNavigationFont() { return new Selector diff --git a/Oobe/OobeWifi/Controls/Wifi/ApView.cs b/Oobe/OobeWifi/Controls/Wifi/ApView.cs index a43b7f4..d2ef3e9 100644 --- a/Oobe/OobeWifi/Controls/Wifi/ApView.cs +++ b/Oobe/OobeWifi/Controls/Wifi/ApView.cs @@ -1,5 +1,4 @@ -using Oobe.Common.Styles; -using System; +using System; using Tizen.Network.WiFi; using Tizen.NUI; using Tizen.NUI.BaseComponents; @@ -79,7 +78,7 @@ namespace Oobe.Wifi.Controls.Wifi { return "Open"; } - else if(wifiAp.SecurityInformation.IsPassphraseRequired == false) + else if (wifiAp.SecurityInformation.IsPassphraseRequired == false) { return "Saved"; } diff --git a/Oobe/OobeWifi/Controls/Wifi/ButtonStyles.cs b/Oobe/OobeWifi/Controls/Wifi/ButtonStyles.cs new file mode 100644 index 0000000..26a2ca4 --- /dev/null +++ b/Oobe/OobeWifi/Controls/Wifi/ButtonStyles.cs @@ -0,0 +1,120 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tizen.NUI; +using Tizen.NUI.BaseComponents; +using Tizen.NUI.Components; + +namespace Oobe.Wifi.Controls.Wifi +{ + public class ButtonStyles + { + public static ButtonStyle Cancel = GetCancelButtonStyle(); + public static ButtonStyle OK = GetOKButtonStyle(); + public static ButtonStyle Scan = GetScanButtonStyle(); + public static ButtonStyle TurnOnOff = GetTurnOnOffButtonStyle(); + public static ButtonStyle Reveal = GetRevealButtonStyle(); + public static ButtonStyle AddNetwork = GetAddNetworkButtonStyle(); + + private static ButtonStyle GetCancelButtonStyle() => new ButtonStyle + { + BackgroundImage = new Selector + { + Normal = NUIApplication.Current.DirectoryInfo.Resource + "button/02_butt_2_empty_action.png", + Pressed = NUIApplication.Current.DirectoryInfo.Resource + "button/02_butt_2_empty_pressed.png", + Disabled = NUIApplication.Current.DirectoryInfo.Resource + "button/02_butt_2_empty_disabled.png", + }, + Text = new TextLabelStyle + { + PointSize = new Selector + { + Normal = 22.0f, + Pressed = 24.0f + }, + EnableMarkup = true, + Text = "CANCEL", //change to TranslatableText alter adding translations + TextColor = new Selector + { + Normal = new Color(0.0f, 20.0f / 255.0f, 71 / 255.0f, 1.0f), + Pressed = new Color(41.0f / 255.0f, 91.0f / 255.0f, 178 / 255.0f, 1.0f), + }, + FontFamily = GetNavigationFont(), + }, + Size2D = new Size2D(240, 72), + }; + + private static ButtonStyle GetScanButtonStyle() => new ButtonStyle + { + BackgroundImage = new Selector + { + Normal = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_scan.png", + Pressed = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_scan_pressed.png", + Disabled = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_scan_disabled.png", + }, + Size2D = new Size2D(72, 32), + }; + + private static ButtonStyle GetTurnOnOffButtonStyle() => new ButtonStyle + { + BackgroundImage = new Selector + { + Normal = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifioff.png", + Disabled = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifioff_disabled.png", + Selected = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifion.png", + DisabledSelected = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_wifion_disabled.png", + }, + Size2D = new Size2D(72, 32), + }; + + private static ButtonStyle GetAddNetworkButtonStyle() => new ButtonStyle + { + BackgroundImage = new Selector + { + Normal = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_addnetwork.png", + Pressed = NUIApplication.Current.DirectoryInfo.Resource + "12_icon_addnetwork_pressed.png", + }, + Size2D = new Size2D(42, 42), + }; + + private static ButtonStyle GetRevealButtonStyle() => new ButtonStyle + { + BackgroundImage = new Selector + { + Normal = System.IO.Path.Combine(NUIApplication.Current.DirectoryInfo.Resource, "12_icon_eye_pw_hidden.png"), + Selected = System.IO.Path.Combine(NUIApplication.Current.DirectoryInfo.Resource, "12_icon_eye_pw_visible.png"), + }, + }; + + private static ButtonStyle GetOKButtonStyle() => new ButtonStyle + { + BackgroundImage = new Selector + { + Normal = NUIApplication.Current.DirectoryInfo.Resource + "button/02_CTA_empty_active.svg", + Pressed = NUIApplication.Current.DirectoryInfo.Resource + "button/02_CTA_empty_selected.svg", + Disabled = NUIApplication.Current.DirectoryInfo.Resource + "button/02_CTA_empty_disabled.svg", + }, + Text = new TextLabelStyle + { + PointSize = new Selector + { + Normal = 22.0f, + Pressed = 24.0f + }, + TextColor = Color.White, + Text = "OK", //change to TranslatableText alter adding translations + FontFamily = GetNavigationFont(), + }, + Size2D = new Size2D(240, 72), + }; + + private static Selector GetNavigationFont() + { + return new Selector + { + Normal = "BreezeSans", + }; + } + } +} diff --git a/Oobe/OobeWifi/Controls/Wifi/FontStyles.cs b/Oobe/OobeWifi/Controls/Wifi/FontStyles.cs new file mode 100644 index 0000000..33a97b5 --- /dev/null +++ b/Oobe/OobeWifi/Controls/Wifi/FontStyles.cs @@ -0,0 +1,29 @@ +using Tizen.NUI; + +namespace Oobe.Wifi.Controls.Wifi +{ + public static class FontsStyles + { + private static PropertyMap light; + + public static PropertyMap Light() + { + if (light == null) + { + light = new PropertyMap(); + light.Add("weight", new PropertyValue("light")); + } + return light; + } + + public static PropertyMap Regular() + { + if (light == null) + { + light = new PropertyMap(); + light.Add("weight", new PropertyValue("regular")); + } + return light; + } + } +} \ No newline at end of file diff --git a/Oobe/OobeWifi/Controls/Wifi/WifiPasswordPopup.cs b/Oobe/OobeWifi/Controls/Wifi/WifiPasswordPopup.cs index 317d98b..9bcd043 100644 --- a/Oobe/OobeWifi/Controls/Wifi/WifiPasswordPopup.cs +++ b/Oobe/OobeWifi/Controls/Wifi/WifiPasswordPopup.cs @@ -1,5 +1,4 @@ -using Oobe.Common.Styles; -using System; +using System; using System.Threading.Tasks; using Tizen.NUI; using Tizen.NUI.BaseComponents; @@ -20,6 +19,7 @@ namespace Oobe.Wifi.Controls.Wifi private const int maxPasswordLength = 63; private string backgroundImagePath = System.IO.Path.Combine(NUIApplication.Current.DirectoryInfo.Resource, "08_popup_body.png"); private WiFiAP wifiAp; + private bool isConnecting = false; public string Password => passwordEntry.Password; @@ -33,29 +33,29 @@ namespace Oobe.Wifi.Controls.Wifi passwordEntry = new PasswordEntry() { Size = new Size(584, 22), - Position = new Position(112, 144), + Position = new Position(112, 134), MaxLength = maxPasswordLength, - PixelSize = 15, + PixelSize = 22, TextColor = new Color(0, 0x0C / 255.0f, 0x2B / 255.0f, 1.0f), FontFamily = "BreezeSans", FontStyle = FontsStyles.Regular(), Revealed = false, }; - passwordEntry.TextChanged += (s, e) => okButton.IsEnabled = Password.Length >= minPasswordLength; + passwordEntry.TextChanged += (s, e) => UpdateOKButton(); this.Add(passwordEntry); - this.Add(new View() + this.Add(new View() //underline { Size = new Size(584, 1), - Position = new Position(104, 160), + Position = new Position(103, 160), BackgroundColor = new Color(0xC3 / 255.0f, 0xCA / 255.0f, 0xD2 / 255.0f, 1.0f), }); var titleLabel = new TextLabel { Size = new Size(808, 35), - Position = new Position(0, 20), + Position = new Position(0, 19), Text = "Enter password", PixelSize = 28, TextColor = new Color(0, 0x14 / 255.0f, 0x47 / 255.0f, 1.0f), @@ -68,8 +68,8 @@ namespace Oobe.Wifi.Controls.Wifi var subtitleLabel = new TextLabel { - Size = new Size(808, 25), - Position = new Position(0, 69), + Size = new Size(808, 26), + Position = new Position(0, 68), Text = $"Enter password to join \"{wifiAp.NetworkInformation.Essid}\"", PixelSize = 20, TextColor = new Color(0, 0x14 / 255.0f, 0x47 / 255.0f, 1.0f), @@ -97,8 +97,8 @@ namespace Oobe.Wifi.Controls.Wifi revealButton = new Button(ButtonStyles.Reveal) { - Size = new Size(22, 13), - Position = new Position(702, 138), + Size = new Size(48, 48), + Position = new Position(696, 120), }; revealButton.ClickEvent += (s, e) => TogglePasswordVisibility(); this.Add(revealButton); @@ -122,12 +122,17 @@ namespace Oobe.Wifi.Controls.Wifi }; okButton.ClickEvent += async (s, e) => { - okButton.IsEnabled = false; + isConnecting = true; + UpdateOKButton(); try { Tizen.Log.Debug("oobe", $"connecting to wifi {wifiAp.NetworkInformation.Essid} with password {Password}"); wifiAp.SecurityInformation.SetPassphrase(Password); - await wifiAp.ConnectAsync(); + var result = await (wifiAp.ConnectAsync() as Task); + if (result == true) + { + OobeCommon.Utils.Popup.Dismiss(); + } } catch (Exception ex) { @@ -135,16 +140,9 @@ namespace Oobe.Wifi.Controls.Wifi } finally { - okButton.IsEnabled = true; - if (wifiAp.NetworkInformation.ConnectionState == WiFiConnectionState.Congfiguration - || wifiAp.NetworkInformation.ConnectionState == WiFiConnectionState.Connected) - { - OobeCommon.Utils.Popup.Dismiss(); - } - else //there should exist explicit password error path - { - connectionFailure.Show(); - } + isConnecting = false; + UpdateOKButton(); + connectionFailure.Show(); } }; this.Add(okButton); @@ -155,5 +153,10 @@ namespace Oobe.Wifi.Controls.Wifi passwordEntry.Revealed = !passwordEntry.Revealed; revealButton.IsSelected = !revealButton.IsSelected; } + + private void UpdateOKButton() + { + okButton.IsEnabled = (Password.Length >= minPasswordLength) && (isConnecting == false); + } } } diff --git a/Oobe/OobeWifi/Controls/Wifi/WifiView.cs b/Oobe/OobeWifi/Controls/Wifi/WifiView.cs index cf34730..87e2844 100644 --- a/Oobe/OobeWifi/Controls/Wifi/WifiView.cs +++ b/Oobe/OobeWifi/Controls/Wifi/WifiView.cs @@ -1,4 +1,3 @@ -using Oobe.Common.Styles; using System; using Tizen.NUI; using Tizen.NUI.BaseComponents; @@ -74,7 +73,7 @@ namespace Oobe.Wifi.Controls.Wifi }); return manualWifi; } - + private static View CreatePasswordPopup(Tizen.Network.WiFi.WiFiAP wifiAp) { var popup = new WifiPasswordPopup(wifiAp); diff --git a/Oobe/OobeWifi/WifiStep.cs b/Oobe/OobeWifi/WifiStep.cs index f8ed041..46f1da4 100644 --- a/Oobe/OobeWifi/WifiStep.cs +++ b/Oobe/OobeWifi/WifiStep.cs @@ -1,5 +1,4 @@ using Oobe.Common.Interfaces; -using Oobe.Common.Styles; using Tizen.NUI.Components; using Tizen.NUI; using Tizen.NUI.BaseComponents; @@ -59,7 +58,7 @@ namespace Oobe.Wifi Layout = new AbsoluteLayout(), }; - var prev = new Button(ButtonStyles.Previous) + var prev = new Button(Common.Styles.ButtonStyles.Previous) { Position = new Position(56, 10), Size2D = new Size2D(240, 72), @@ -75,7 +74,9 @@ namespace Oobe.Wifi next.ClickEvent += (s, e) => nav.Next(); view.Add(next); - void applyStyle(bool isConnected) => next.ApplyStyle(isConnected ? ButtonStyles.Next : ButtonStyles.Skip); + void applyStyle(bool isConnected) => next.ApplyStyle(isConnected + ? Common.Styles.ButtonStyles.Next + : Common.Styles.ButtonStyles.Skip); applyStyle(WiFiManager.ConnectionState == WiFiConnectionState.Connected); connectionChanged = (s, e) => applyStyle(e.State == WiFiConnectionState.Connected); diff --git a/Oobe/OobeWifi/res/12_icon_addnetwork.svg b/Oobe/OobeWifi/res/12_icon_addnetwork.svg deleted file mode 100644 index e34390a..0000000 --- a/Oobe/OobeWifi/res/12_icon_addnetwork.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Oobe/OobeWifi/res/12_icon_eye_pw_hidden.png b/Oobe/OobeWifi/res/12_icon_eye_pw_hidden.png index 31471c767472e977f43ffe1945a54dfc08071228..72f3203ba827803a2e843d16d735a56ce185f1eb 100644 GIT binary patch literal 1283 zcmV+e1^oJnP)7ZURwJ}UqK1dvHY zK~!ko?U!9_R7DiWf9Kw|2yOWa5Q|8vCQ7aCg3v9Nt*}q}W*Qno2uMUj(xg^|7$f4N z0Us0r`P2weKFk`#7mP-eCf$m3yCU7TRKkO;A)pp$OIr%;-Z?((Z7FFD-L~M%{Uw{+ zy>ri*|IC@0a|S#-JUl!+JUl!+#zJjfwgy?X?#aTKUJ6_uq;*k zwDA(6suGSi6p3180woGh0aM-PPJ#0Zr&P>|(nY>{fN*`|M~ZGpej-;aq%75bWvs$a zpT00TE;n9Bqyl(kgk~2}{Tq>m?*B{1;>D$l3L78T0HV=o`c0FuN#QME`WWWmAEUZ> zX|eB*(HM_v5BwZyp5JHEBMMuG5g!K*h|%W~z1b5Jy;swXah_DscTqZqaW~5rIUcTS z@{LAI$`PoEG*k%kF^~b=7UT<6U5Su|&>==&3KaXoL+qmGaxjUX1fF&`jU!@zshCv* zzJ#hkQQ`jk5`pUK>a=hqc0iClZih{l=t4yM5V8O@M$3m2AFhu*E+!Ek5D$Hb*ap*S zEEWMxK!z&&YU&&IhC(5GTqE$^g$on1JNk|RWvv4{ZBog-=Ku&JnPDPgk3bG;KFW7n~d@{HH*>PwY z$O$5=|HIt@fZ&1!oxmjkOHFQnV`;JPeUf=W5z2FN^LCEwDI{V>_`T)~_coDm%%HWK zd{*@CK2kea?kVVUYfBZv*MO+X_HZP&MODR}y|(`EY@0lH?Y|9@KXgn|yKM3NHh>?a z(J2a#0vO9`>(Au1k=T2xvfbUAq06l;RpYXWo12?6uJt%a5XxPn!&ahaedo-XCcC4r z9mod#29Z{jjjrMwf^;in3G#g$t1{@%|7*}uya%}6J#FHwsqO8SV`uJ1WKI9po1ST} z8ObIdakxUEkUcv$Z8`(tw-7A=7P9ddK8D%B4Q^UYHQq38eHtVI3$Bd z8=o*nPm(P3dIdSA=vp8hxTUI<&lmeXyYID7&FRKMvGgGD>@dxaAP0@ep|tq*Gq-N# zsFl@~XJM^GsRSksS6Ug1bq}$p_(Fqdix}${;KUODGrx+6j>knRFHv literal 623 zcmV-#0+9WQP)z=Z80;QqQrTF+6Uf%G0%0MPWr5)Wid#403BnD;Mb;)K zNIXH369hraf-D$N%cXDw;wm+NZM_E%lOVHsf8Xoxd)@sFvEjQMjq*X{y%N|2RRFlR z4DAXCNnX^R?shlb=luf%=qLVxl(h-wH(hi|Kz{Ije;UW}drGrfwbU_ZcYym>-}jYe zCnO7kt_kiy7{g;b@sn^H+xaAlS|Uu+omC6~GY8nNSBj^1fP2G9i@*t_naGZrOSq_4 zi_QC0_Xd+Di8HhR4_sjqWQ|6-JYNBSxf-`6el$SoR@%zNxg$W$G{_1j&;kK(1tcK0 z2)uO3Jmku$(gLVc0>2$NU8Mp()hor8xzHa@tSGfgao>!+!T1l!2ev{fA#f-#v{jQ0 zBjVTL&%G2$*MV~h@f=b2}RupkcqO{<2QGk1?p&|;RsRMQA))lwG0T>!A1pq!L zLE1Dte;fTO+~8(z<|aNDc_V_?9&@c!$r*@;|8+%wI6eY+uvB`!taeVIQ>&DY9Tg@) z5=Uo?hEZroY39*yKCe6pUEIpYy}{(1P-sPgjzB(gL6W8W^2G} zUNycJ+J^hJ?pt`>iu \ No newline at end of file diff --git a/Oobe/OobeWifi/res/12_icon_eye_pw_visible.png b/Oobe/OobeWifi/res/12_icon_eye_pw_visible.png index d4ceeede03708f07aa658b4bb27b9204ff0453e0..a416a9f3a8b3d7fdc48e64e885ddada0c63c47d0 100644 GIT binary patch literal 1176 zcmV;J1ZVq+P)76SLN9}WNj1SLsC zK~!ko?U!F{Q*{)_Kj+@wmLZ!ugCI`hAHt|JY8;q|FXPD=VPn}kW?Nk30kepcX^e^D zi^iZPiZFFR49wXLXkC_WLSlS?sL=%RPa>@B%_&HTf^(y+>)LyK=77Z(>77ncH&nRBI55&UGSiq zE4~5It0IAgq5UNmnWuqf;O1$iiXJya+OuA58{Anl`oAPlxo*3aOfGm%(C2~D0^OVj zeRJN4lD7{YT%IY!fl-K2MR4DJ=aTae3A*Xx;AKLD9l(QQR&mk16U7!Pi$r({ICFuk z8$jMTRW^F4BHVxP6;Z$+j5j0l4&VjSD4ht6z#QNY5u;`xvf_&=ZNoh`VOxC&OMp?( zJs?eaUm~;&M5?!676q!R4tV^b_zpzgcNRQ?VN|Lx<^->XLH$1k50Hq|owUr%qrk5~ zF-TIemjFiquPWR8p?Euis5zqwEPQ0Y&nlhR4N~hEb)2(`n*oX@Mt=k5h|)9AU0t8I zSsd_D%*e&Bb}Q2Cz!>SZyO?y1BlWi6RF_QSVQ{K z6$nI4@Aa83CwNu##euHsCw}T!o+?U@JmCEM*l71;@S%8 z-3w%Zl8o24^mwdcEYV%l1Z>O|Wa_eBU)OY$_|F9V-dS5!r~_0~HXQ4!*)%DiaBKdv z$21e?Wi`SVmrfp96x??^zz-d@!_GFsRO7bEE!I{28loF=IY_bbe2CxOaU=f+oL!3ybS`djj=Vh}$*uOEq6%cbM|6V4W^`G}Dktt5wm&f+3 z8UnZ@5WN<-C8vx%l#kpWj=v0ScGij}(y5k9S0L7qHO9xnihi66L|^rX`a8=4(W3Ne z<4~>~f{299SDTfcKr8SIkQAlI@R))8_~5gALBIq?vS+NrWr1jsKh*yrDz7*$qDDHk zhFC*(=K4S&YWjUeZKyUoPX-K;U{-alKntLVKAecueD-f{${XVg#FXy^ZbW5^t@cjC zkZz#DQR2Nsdi7kGT&h z2a+he5orRoP{uK2eIl~*gUdb(l|L50$1r3UaQ_rPXHj<9q8-Wf_;;Rb=IZR!h+j>k z5p;d7tX@>24y)K}k9Dp3@rn&|RaFN(r^?Q@qWVH^rYVTu6@7jFiIOda4s(}0PM5EZ z7t1*71!>M#mTB;_BJE~+?A@cWhO<}Ag{FK>U!`QFR)l51VsI`rFf2&IR{dH{?H&B6 q`rDbh(73p`xVX5uxVX5u6wF_%x`qRksCSMqNlwAg(}|nYQ{34+)5~nVI)`zV7$;-$QJ@J{I5(WNn%X{hgVYaS@hDzBAxO41mV4T|8ffFTvSLze?f)f_nk#i|5|3Q!KAn z^Q`hEpJH?iK@X4-$TNue6E8j-wT{OcZ@{^eeht6}4V-vUH9dD45R|80oYBDNudmB4 zQ4>%vTiwy&R)y+)P7^~)qC7oM>4B?htgk1o80BiQt5A0?eA|fLa#>26o z{%r&a(Z8m1E7%4bJ;PMqzDKb${@*{s#{B`d@gmcG1Qcli O0000Ba diff --git a/Oobe/OobeWifi/res/12_icon_eye_pw_visible.svg b/Oobe/OobeWifi/res/12_icon_eye_pw_visible.svg deleted file mode 100644 index d49e634..0000000 --- a/Oobe/OobeWifi/res/12_icon_eye_pw_visible.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Oobe/OobeWifi/res/12_icon_scan.svg b/Oobe/OobeWifi/res/12_icon_scan.svg deleted file mode 100644 index 74eb1a3..0000000 --- a/Oobe/OobeWifi/res/12_icon_scan.svg +++ /dev/null @@ -1 +0,0 @@ -Scan \ No newline at end of file diff --git a/Oobe/OobeWifi/res/12_icon_wifi.svg b/Oobe/OobeWifi/res/12_icon_wifi.svg deleted file mode 100644 index c77a16d..0000000 --- a/Oobe/OobeWifi/res/12_icon_wifi.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Oobe/OobeWifi/res/12_icon_wifioff.svg b/Oobe/OobeWifi/res/12_icon_wifioff.svg deleted file mode 100644 index 413a46d..0000000 --- a/Oobe/OobeWifi/res/12_icon_wifioff.svg +++ /dev/null @@ -1 +0,0 @@ -OFF \ No newline at end of file diff --git a/Oobe/OobeWifi/res/12_icon_wifion.svg b/Oobe/OobeWifi/res/12_icon_wifion.svg deleted file mode 100644 index 9bd94f6..0000000 --- a/Oobe/OobeWifi/res/12_icon_wifion.svg +++ /dev/null @@ -1 +0,0 @@ -ON \ No newline at end of file diff --git a/Oobe/OobeWifi/res/Line_94.svg b/Oobe/OobeWifi/res/Line_94.svg deleted file mode 100644 index 6fd7132..0000000 --- a/Oobe/OobeWifi/res/Line_94.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Oobe/OobeWifi/res/Rectangle_918.svg b/Oobe/OobeWifi/res/Rectangle_918.svg deleted file mode 100644 index 64e2b00..0000000 --- a/Oobe/OobeWifi/res/Rectangle_918.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Oobe/OobeWifi/res/small12_icon_eye_pw_hidden.png b/Oobe/OobeWifi/res/small12_icon_eye_pw_hidden.png new file mode 100644 index 0000000000000000000000000000000000000000..31471c767472e977f43ffe1945a54dfc08071228 GIT binary patch literal 623 zcmV-#0+9WQP)z=Z80;QqQrTF+6Uf%G0%0MPWr5)Wid#403BnD;Mb;)K zNIXH369hraf-D$N%cXDw;wm+NZM_E%lOVHsf8Xoxd)@sFvEjQMjq*X{y%N|2RRFlR z4DAXCNnX^R?shlb=luf%=qLVxl(h-wH(hi|Kz{Ije;UW}drGrfwbU_ZcYym>-}jYe zCnO7kt_kiy7{g;b@sn^H+xaAlS|Uu+omC6~GY8nNSBj^1fP2G9i@*t_naGZrOSq_4 zi_QC0_Xd+Di8HhR4_sjqWQ|6-JYNBSxf-`6el$SoR@%zNxg$W$G{_1j&;kK(1tcK0 z2)uO3Jmku$(gLVc0>2$NU8Mp()hor8xzHa@tSGfgao>!+!T1l!2ev{fA#f-#v{jQ0 zBjVTL&%G2$*MV~h@f=b2}RupkcqO{<2QGk1?p&|;RsRMQA))lwG0T>!A1pq!L zLE1Dte;fTO+~8(z<|aNDc_V_?9&@c!$r*@;|8+%wI6eY+uvB`!taeVIQ>&DY9Tg@) z5=Uo?hEZroY39*yKCe6pUEIpYy}{(1P-sPgjzB(gL6W8W^2G} zUNycJ+J^hJ?pt`>iuMqNlwAg(}|nYQ{34+)5~nVI)`zV7$;-$QJ@J{I5(WNn%X{hgVYaS@hDzBAxO41mV4T|8ffFTvSLze?f)f_nk#i|5|3Q!KAn z^Q`hEpJH?iK@X4-$TNue6E8j-wT{OcZ@{^eeht6}4V-vUH9dD45R|80oYBDNudmB4 zQ4>%vTiwy&R)y+)P7^~)qC7oM>4B?htgk1o80BiQt5A0?eA|fLa#>26o z{%r&a(Z8m1E7%4bJ;PMqzDKb${@*{s#{B`d@gmcG1Qcli O0000Ba literal 0 HcmV?d00001 -- 2.7.4