From ad47e4ad7ba16fd03070698844fe61f81a3f8496 Mon Sep 17 00:00:00 2001 From: Satoxyan Date: Sat, 29 Mar 2025 13:20:39 +0700 Subject: [PATCH 1/7] wifinetworks:add show password button --- .../sideright/centermodules/wifinetworks.js | 23 +++++++++++++++++-- .config/ags/scss/_sidebars.scss | 16 ++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.config/ags/modules/sideright/centermodules/wifinetworks.js b/.config/ags/modules/sideright/centermodules/wifinetworks.js index 5932ce4f..3e856c53 100644 --- a/.config/ags/modules/sideright/centermodules/wifinetworks.js +++ b/.config/ags/modules/sideright/centermodules/wifinetworks.js @@ -19,6 +19,7 @@ const MATERIAL_SYMBOL_SIGNAL_STRENGTH = { let connectAttempt = ''; let networkAuth = null; let networkAuthSSID = null; +let passwordVisible = false; const WifiNetwork = (accessPoint) => { const networkStrength = MaterialIcon(MATERIAL_SYMBOL_SIGNAL_STRENGTH[accessPoint.iconName], 'hugerass') @@ -171,6 +172,15 @@ const CurrentNetwork = () => { cancelAuthButton ] }); + const authVisible = Button({ + child: MaterialIcon('visibility', 'large'), + className: 'txt sidebar-wifinetworks-auth-visible', + onClicked: () => { + passwordVisible = !passwordVisible; + authEntry.visibility = passwordVisible; + }, + setup: setupCursorHover, + }); const authFailed = Revealer({ revealChild: false, child: Label({ @@ -181,6 +191,7 @@ const CurrentNetwork = () => { const authEntry = Entry({ className: 'sidebar-wifinetworks-auth-entry', visibility: false, + hexpand: true, onAccept: (self) => { authLock = false; // Delete SSID connection before attempting to reconnect @@ -202,6 +213,14 @@ const CurrentNetwork = () => { }, placeholderText: getString('Enter network password'), }); + const authBox = Box({ + className: 'spacing-h-5', + vertical: false, + children: [ + authEntry, + authVisible, + ] + }); const forgetButton = Button({ label: getString('Forget'), hexpand: true, @@ -270,7 +289,7 @@ const CurrentNetwork = () => { vertical: true, children: [ authHeader, - authEntry, + authBox, authFailed, ] }), @@ -291,7 +310,7 @@ const CurrentNetwork = () => { self.revealChild = false; authFailed.revealChild = false; Network.wifi.state = 'activated'; - }, 20000); // 20 seconds timeout + }, 60000); // 60 seconds timeout } } ).catch(print); diff --git a/.config/ags/scss/_sidebars.scss b/.config/ags/scss/_sidebars.scss index 3ffe0bcc..d6591e33 100644 --- a/.config/ags/scss/_sidebars.scss +++ b/.config/ags/scss/_sidebars.scss @@ -1007,13 +1007,27 @@ $waifu_image_overlay_transparency: 0.7; } .sidebar-wifinetworks-auth-entry { - @include small-rounding; + border-radius: 12px 0px 0px 12px; background-color: $layer1; color: $onLayer1; padding: 0.682rem; caret-color: $onLayer2; } +.sidebar-wifinetworks-auth-visible { + @include element_decel; + border-radius: 0px 12px 12px 0px; + background-color: $layer2Hover; + color: $onLayer2; + padding: 0.682rem; + min-width: 0.918rem; +} + +.sidebar-wifinetworks-auth-visible:hover, +.sidebar-wifinetworks-auth-visible:focus { + background-color: $layer2Active; +} + .sidebar-wifinetworks-bandwidth { min-width: 6.3rem; padding-left: 1rem; From e267e4e821407adae3eca1ce25c73b14715d9001 Mon Sep 17 00:00:00 2001 From: Satoxyan Date: Sat, 29 Mar 2025 13:30:35 +0700 Subject: [PATCH 2/7] wifinetworks:fix color for show button --- .config/ags/scss/_sidebars.scss | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.config/ags/scss/_sidebars.scss b/.config/ags/scss/_sidebars.scss index d6591e33..9202c0b5 100644 --- a/.config/ags/scss/_sidebars.scss +++ b/.config/ags/scss/_sidebars.scss @@ -1017,15 +1017,18 @@ $waifu_image_overlay_transparency: 0.7; .sidebar-wifinetworks-auth-visible { @include element_decel; border-radius: 0px 12px 12px 0px; - background-color: $layer2Hover; + background-color: $layer3; color: $onLayer2; padding: 0.682rem; min-width: 0.918rem; -} -.sidebar-wifinetworks-auth-visible:hover, -.sidebar-wifinetworks-auth-visible:focus { - background-color: $layer2Active; + &:hover, + &:focus { + background-color: $layer3Hover; + } + &:active { + background-color: $layer3Active; + } } .sidebar-wifinetworks-bandwidth { From 53072cb8150c3344612cdd51743c5b22c1c47c1c Mon Sep 17 00:00:00 2001 From: Satoxyan Date: Sat, 29 Mar 2025 14:05:57 +0700 Subject: [PATCH 3/7] wifinetworks:make password vissibility off after authEntry hide --- .config/ags/modules/sideright/centermodules/wifinetworks.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/ags/modules/sideright/centermodules/wifinetworks.js b/.config/ags/modules/sideright/centermodules/wifinetworks.js index 3e856c53..665ae149 100644 --- a/.config/ags/modules/sideright/centermodules/wifinetworks.js +++ b/.config/ags/modules/sideright/centermodules/wifinetworks.js @@ -155,6 +155,8 @@ const CurrentNetwork = () => { label: getString('Cancel'), hpack: 'end', onClicked: () => { + passwordVisible = false; + authEntry.visibility = false; networkAuth.revealChild = false; authFailed.revealChild = false; networkAuthSSID.label = ''; @@ -204,6 +206,8 @@ const CurrentNetwork = () => { networkAuth.revealChild = false; // Hide input if successful authFailed.revealChild = false; // Hide failed message if successful self.text = ''; // Empty input for retry + passwordVisible = false; + authEntry.visibility = false; }) .catch(() => { // Connection failed, show password input again @@ -307,6 +311,8 @@ const CurrentNetwork = () => { } timeoutId = setTimeout(() => { authLock = false; + passwordVisible = false; + authEntry.visibility = false; self.revealChild = false; authFailed.revealChild = false; Network.wifi.state = 'activated'; From 043ee5974e1ac8aadcfeb36b7c1ba50b79847746 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Sat, 29 Mar 2025 09:29:49 +0100 Subject: [PATCH 4/7] make passwordVisible more local --- .config/ags/modules/sideright/centermodules/wifinetworks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/ags/modules/sideright/centermodules/wifinetworks.js b/.config/ags/modules/sideright/centermodules/wifinetworks.js index 665ae149..7e10d357 100644 --- a/.config/ags/modules/sideright/centermodules/wifinetworks.js +++ b/.config/ags/modules/sideright/centermodules/wifinetworks.js @@ -19,7 +19,6 @@ const MATERIAL_SYMBOL_SIGNAL_STRENGTH = { let connectAttempt = ''; let networkAuth = null; let networkAuthSSID = null; -let passwordVisible = false; const WifiNetwork = (accessPoint) => { const networkStrength = MaterialIcon(MATERIAL_SYMBOL_SIGNAL_STRENGTH[accessPoint.iconName], 'hugerass') @@ -99,6 +98,7 @@ const NetResource = (icon, command) => { } const CurrentNetwork = () => { + let passwordVisible = false; let authLock = false; let timeoutId = null; From eb20cb5155e7c83c7b231ae7c945bc376819c349 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Sat, 29 Mar 2025 09:31:30 +0100 Subject: [PATCH 5/7] styles: wifinetworks: fix layer inconsistency --- .config/ags/scss/_sidebars.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/ags/scss/_sidebars.scss b/.config/ags/scss/_sidebars.scss index 9202c0b5..1243fa02 100644 --- a/.config/ags/scss/_sidebars.scss +++ b/.config/ags/scss/_sidebars.scss @@ -1018,7 +1018,7 @@ $waifu_image_overlay_transparency: 0.7; @include element_decel; border-radius: 0px 12px 12px 0px; background-color: $layer3; - color: $onLayer2; + color: $onLayer3; padding: 0.682rem; min-width: 0.918rem; From a73a89356ed8fdd9f06edc22d83da107a2a83775 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Sat, 29 Mar 2025 09:45:12 +0100 Subject: [PATCH 6/7] wifi networks: auth entry layout adjustments --- .../sideright/centermodules/wifinetworks.js | 4 ++-- .config/ags/scss/_sidebars.scss | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.config/ags/modules/sideright/centermodules/wifinetworks.js b/.config/ags/modules/sideright/centermodules/wifinetworks.js index 7e10d357..0075da13 100644 --- a/.config/ags/modules/sideright/centermodules/wifinetworks.js +++ b/.config/ags/modules/sideright/centermodules/wifinetworks.js @@ -175,6 +175,7 @@ const CurrentNetwork = () => { ] }); const authVisible = Button({ + vpack: 'center', child: MaterialIcon('visibility', 'large'), className: 'txt sidebar-wifinetworks-auth-visible', onClicked: () => { @@ -218,8 +219,7 @@ const CurrentNetwork = () => { placeholderText: getString('Enter network password'), }); const authBox = Box({ - className: 'spacing-h-5', - vertical: false, + className: 'sidebar-wifinetworks-auth-box', children: [ authEntry, authVisible, diff --git a/.config/ags/scss/_sidebars.scss b/.config/ags/scss/_sidebars.scss index 1243fa02..52103c46 100644 --- a/.config/ags/scss/_sidebars.scss +++ b/.config/ags/scss/_sidebars.scss @@ -1006,21 +1006,25 @@ $waifu_image_overlay_transparency: 0.7; font-size: 2.045rem; } -.sidebar-wifinetworks-auth-entry { - border-radius: 12px 0px 0px 12px; +.sidebar-wifinetworks-auth-box { + @include small-rounding; background-color: $layer1; color: $onLayer1; +} + +.sidebar-wifinetworks-auth-entry { + @include small-rounding; + color: $onLayer1; padding: 0.682rem; caret-color: $onLayer2; } .sidebar-wifinetworks-auth-visible { @include element_decel; - border-radius: 0px 12px 12px 0px; - background-color: $layer3; - color: $onLayer3; - padding: 0.682rem; - min-width: 0.918rem; + @include small-rounding; + min-width: 2.045rem; + min-height: 2.045rem; + margin: 0.341rem; &:hover, &:focus { From 20a827bc007f32ee128f1303efafee8359457a0f Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Sat, 29 Mar 2025 09:53:36 +0100 Subject: [PATCH 7/7] wifi networks: auth entry: make visibility icon adapt --- .config/ags/modules/sideright/centermodules/wifinetworks.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/ags/modules/sideright/centermodules/wifinetworks.js b/.config/ags/modules/sideright/centermodules/wifinetworks.js index 0075da13..aecbaa8d 100644 --- a/.config/ags/modules/sideright/centermodules/wifinetworks.js +++ b/.config/ags/modules/sideright/centermodules/wifinetworks.js @@ -178,9 +178,10 @@ const CurrentNetwork = () => { vpack: 'center', child: MaterialIcon('visibility', 'large'), className: 'txt sidebar-wifinetworks-auth-visible', - onClicked: () => { + onClicked: (self) => { passwordVisible = !passwordVisible; authEntry.visibility = passwordVisible; + self.child.label = passwordVisible ? 'visibility_off' : 'visibility'; }, setup: setupCursorHover, });