From aaf7e53b969748dd2e6cbacd5bc6a946e791a1a4 Mon Sep 17 00:00:00 2001
From: Sowgro <tpoke.ferrari@gmail.com>
Date: Tue, 31 Oct 2023 15:25:52 -0400
Subject: fix saving and text alignment issues

---
 CustomApps/betterLibrary/betterlibrary.js | 37 +++++++++++++++++++++----------
 CustomApps/betterLibrary/loadcss.js       |  6 -----
 CustomApps/betterLibrary/style.css        |  2 +-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/CustomApps/betterLibrary/betterlibrary.js b/CustomApps/betterLibrary/betterlibrary.js
index dbb13b3..6dad487 100644
--- a/CustomApps/betterLibrary/betterlibrary.js
+++ b/CustomApps/betterLibrary/betterlibrary.js
@@ -14,6 +14,15 @@ function startListener() {
         if (location.pathname != '/betterlibrary' && betterLibIsEnabled)
             disableBetterLib();
     });
+    window.addEventListener(
+        'beforeunload',
+        (event) => {
+            if (betterLibIsEnabled)
+            {
+                disableBetterLib();
+            }
+        }
+        )
 }
 
 function enableBetterLib() {
@@ -45,12 +54,12 @@ function enableBetterLib() {
             }
 
             //store last icons mode and compact mode
-            lastViewIcons = Spicetify.Platform.LocalStorageAPI.getItem("items-view")
-            lastViewCompact = Spicetify.Platform.LocalStorageAPI.getItem("library-row-mode")
+            lastViewIcons = Spicetify.Platform.LocalStorageAPI.getItem("items-view");
+            lastViewCompact = Spicetify.Platform.LocalStorageAPI.getItem("library-row-mode");
 
             //get betterlib icons mode and compact mode from storage
-            newViewIcons = Spicetify.Platform.LocalStorageAPI.getItem("betterlib-items-view")
-            newViewCompact = Spicetify.Platform.LocalStorageAPI.getItem("betterlib-library-row-mode")
+            newViewIcons = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("betterlib-items-view"),10);
+            newViewCompact = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("betterlib-library-row-mode"),10);
 
             //apply betterlib icons mode and compact mode
             Spicetify.Platform.LocalStorageAPI.setItem("items-view", newViewIcons);
@@ -69,6 +78,18 @@ function disableBetterLib() {
         document.documentElement.style.setProperty("--betterlib-show-placeholder-text","flex");
     }
 
+    //get current betterlib icons mode and compact mode
+    currentViewIcons = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("items-view"),10);
+    currentViewCompact = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("library-row-mode"),10);
+
+    //save betterlib icons mode and compact mode to storage
+    Spicetify.Platform.LocalStorageAPI.setItem("betterlib-items-view", currentViewIcons);
+    Spicetify.Platform.LocalStorageAPI.setItem("betterlib-library-row-mode", currentViewCompact);
+
+    //revert icons and compact mode to last
+    Spicetify.Platform.LocalStorageAPI.setItem("items-view", lastViewIcons);
+    Spicetify.Platform.LocalStorageAPI.setItem("library-row-mode", lastViewCompact);
+
     //revert swap
     sidebar.appendChild(library);
     center.appendChild(text);
@@ -77,14 +98,6 @@ function disableBetterLib() {
     Spicetify.Platform.LocalStorageAPI.setItem("lx-expanded-state-nav-bar-width",lastSidebarSize);
     Spicetify.Platform.LocalStorageAPI.setItem("ylx-sidebar-state",lastSidebarMode);
 
-    //save betterlib icons mode and compact mode to storage
-    Spicetify.Platform.LocalStorageAPI.setItem("betterlib-items-view", Spicetify.Platform.LocalStorageAPI.getItem("items-view"));
-    Spicetify.Platform.LocalStorageAPI.setItem("betterlib-library-row-mode", Spicetify.Platform.LocalStorageAPI.getItem("library-row-mode"));
-
-    //revert icons and compact mode to last
-    Spicetify.Platform.LocalStorageAPI.setItem("items-view", lastViewIcons);
-    Spicetify.Platform.LocalStorageAPI.setItem("library-row-mode", lastViewCompact);
-
     betterLibIsEnabled = false;
 }
 
diff --git a/CustomApps/betterLibrary/loadcss.js b/CustomApps/betterLibrary/loadcss.js
index 43cde6c..8d88d0e 100644
--- a/CustomApps/betterLibrary/loadcss.js
+++ b/CustomApps/betterLibrary/loadcss.js
@@ -5,10 +5,4 @@
         // the line above is not working. directly add css instead
         '<style>.Root__top-container:has(.betterLibBox) .LayoutResizer__resize-bar{visibility:hidden}.betterLibText{display:none;justify-content:center;align-items:center;height:100%}.main-yourLibraryX-library .betterLibText{display:var(--betterlib-show-placeholder-text)}.Button-sc-1dqy6lx-0.Button-md-24-buttonTertiary-iconLeading-condensed-useBrowserDefaultFocusStyle.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base,.Button-sc-1dqy6lx-0.Button-md-24-buttonTertiary-iconLeading-condensed-useBrowserDefaultFocusStyle.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base.main-useDropTarget-track.main-useDropTarget-album.main-useDropTarget-artist.main-useDropTarget-playlistV2.main-useDropTarget-show.main-useDropTarget-episode{pointer-events:none;font-size:x-large;color:white}.main-yourLibraryX-library .main-yourLibraryX-header{display:none}.main-yourLibraryX-library .main-yourLibraryX-header:has(.WYU7SXdABSulyirnmIYb){display:flex}.IconWrapper__Wrapper-sc-16usrgb-0.Wrapper-md-leading{display:none}.Button-sc-1dqy6lx-0.Button-md-24-buttonTertiary-iconOnly-condensed-useBrowserDefaultFocusStyle.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base{display:none}button.Button-sc-1dqy6lx-0.Button-sm-16-buttonTertiary-iconOnly-useBrowserDefaultFocusStyle.main-yourLibraryX-button.main-yourLibraryX-iconOnly.main-useDropTarget-base{display:none}button.Button-sc-1dqy6lx-0.Button-sm-16-buttonTertiary-iconOnly-useBrowserDefaultFocusStyle.main-yourLibraryX-createButton.main-yourLibraryX-button.main-yourLibraryX-iconOnly.main-useDropTarget-base.main-useDropTarget-track.main-useDropTarget-album.main-useDropTarget-playlistV2{display:inherit}span button.Button-sc-1dqy6lx-0.Button-sm-16-buttonTertiary-iconOnly-useBrowserDefaultFocusStyle.main-yourLibraryX-button.main-yourLibraryX-iconOnly.main-useDropTarget-base{display:inherit}.main-yourLibraryX-library{padding-top:5px}span.Type__TypeElement-sc-goli3j-0.TypeElement-balladBold-type{display:var(--betterlib-fix-collaped-view,inherit)}.main-yourLibraryX-entryPoints.main-yourLibraryX-library{display:var(--betterlib-hide-sidebar-library,inherit)}');
     // disable after window is closed to prevent an expanded sidebar on opening
-    window.addEventListener(
-        'beforeunload',
-        (event) => {
-            disableBetterLib();
-        }
-        )
 })();
\ No newline at end of file
diff --git a/CustomApps/betterLibrary/style.css b/CustomApps/betterLibrary/style.css
index 9b0c188..235be85 100644
--- a/CustomApps/betterLibrary/style.css
+++ b/CustomApps/betterLibrary/style.css
@@ -13,7 +13,7 @@
 
 /* makes the text visible only when it is in the sidebar */
 .main-yourLibraryX-library .betterLibText {
-    display: var(--betterlib-show-placeholder-text);
+    display: var(--betterlib-show-placeholder-text,flex);
 }
 
 /* makes the "your library" text not clickable */
-- 
cgit v1.2.3