Remove old DEBUG Keyboard shortcuts (use fpcp when launching instead).

Remove icon cache, completely unecessary and only used in 1 spot.

SongBrowserPlugin/SongBrowserApplication.cs

@@ -18,8 +18,6 @@ namespace SongBrowser
         private SongBrowserUI _songBrowserUI;
         private ScoreSaberDatabaseDownloader _ppDownloader;
 
-        public Dictionary<String, Sprite> CachedIcons;
-
         public static SongBrowser.UI.ProgressBar MainProgressBar;
 
 
@@ -61,7 +59,6 @@ namespace SongBrowser
         {
             Logger.Trace("Start-SongBrowserApplication()");
 
-            AcquireUIElements();
             InstallHandlers();
 
             StartCoroutine(ScrappedData.Instance.DownloadScrappedData((List<ScrappedSong> songs) => { }));
@@ -74,6 +71,16 @@ namespace SongBrowser
             {
                 SongCore.Loader.SongsLoadedEvent += OnSongLoaderLoadedSongs;
             }
+
+            /*foreach (RectTransform rect in Resources.FindObjectsOfTypeAll<RectTransform>())
+            {
+                Logger.Debug("RectTransform: {0}", rect.name);
+            }*/
+
+            /*foreach (Sprite sprite in Resources.FindObjectsOfTypeAll<Sprite>())
+            {
+                Logger.Debug("Adding Icon: {0}", sprite.name);
+            }*/
         }
 
         /// <summary>
@@ -119,37 +126,6 @@ namespace SongBrowser
         }
 
         /// <summary>
-        /// Get a handle to the view controllers we are going to add elements to.
-        /// </summary>
-        private void AcquireUIElements()
-        {
-            Logger.Trace("AcquireUIElements()");        
-            try
-            {
-                CachedIcons = new Dictionary<String, Sprite>();
-                foreach (Sprite sprite in Resources.FindObjectsOfTypeAll<Sprite>())
-                {
-                    if (CachedIcons.ContainsKey(sprite.name))
-                    {
-                        continue;
-                    }
-
-                    //Logger.Debug("Adding Icon: {0}", sprite.name);
-                    CachedIcons.Add(sprite.name, sprite);
-                }
-
-                /*foreach (RectTransform rect in Resources.FindObjectsOfTypeAll<RectTransform>())
-                {
-                    Logger.Debug("RectTransform: {0}", rect.name);
-                }*/
-            }
-            catch (Exception e)
-            {
-                Logger.Exception("Exception AcquireUIElements(): ", e);
-            }
-        }
-
-        /// <summary>
         /// Install Our Handlers so we can react to ingame events.
         /// </summary>
         private void InstallHandlers()
@@ -234,44 +210,5 @@ namespace SongBrowser
             Button buttonInstance = Resources.FindObjectsOfTypeAll<Button>().First(x => (x.name == buttonName));
             buttonInstance.onClick.Invoke();
         }
-
-#if DEBUG
-        /// <summary>
-        /// Map some key presses directly to UI interactions to make testing easier.
-        /// </summary>
-        private void LateUpdate()
-        {            
-            // z,x,c,v can be used to get into a song, b will hit continue button after song ends
-            if (Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.Z))
-            {
-                InvokeBeatSaberButton("PartyFreePlayButton");
-            }
-            else if (Input.GetKeyDown(KeyCode.Z))
-            {
-                InvokeBeatSaberButton("SoloFreePlayButton");
-            }
-
-            if (Input.GetKeyDown(KeyCode.Alpha0))
-            {
-                InvokeBeatSaberButton("SettingsButton");
-            }
-
-            if (Input.GetKeyDown(KeyCode.Alpha9))
-            {
-                InvokeBeatSaberButton("ApplyButton");
-            }
-
-            if (Input.GetKeyDown(KeyCode.Alpha8))
-            {
-                Console.WriteLine("CLICKING OK BUTTON");
-                var settings = Resources.FindObjectsOfTypeAll<VRUI.VRUIViewController>().First(x => x.name == "SettingsViewController");
-                var button = settings.GetComponentsInChildren<Button>().Where(x => x.name == "OkButton");
-                foreach (Button b in button)
-                {
-                    b.onClick.Invoke();
-                }                
-            }
-        }
-#endif
     }
 }

SongBrowserPlugin/UI/Browser/SongBrowserUI.cs

@@ -248,8 +248,8 @@ namespace SongBrowser.UI
 
                 Button playButton = Resources.FindObjectsOfTypeAll<Button>().First(x => x.name == "PlayButton");
                 RectTransform playButtonRect = (playButton.transform as RectTransform);
-                Sprite arrowIcon = SongBrowserApplication.Instance.CachedIcons["ArrowIcon"];
-                Sprite borderSprite = SongBrowserApplication.Instance.CachedIcons["RoundRectBigStroke"];            
+                Sprite arrowIcon = Resources.FindObjectsOfTypeAll<Sprite>().First(x => x.name == "ArrowIcon");
+                Sprite borderSprite = Resources.FindObjectsOfTypeAll<Sprite>().First(x => x.name == "RoundRectBigStroke");
 
                 // Create Sorting Songs By-Buttons
                 Logger.Debug("Start creation of UI...");
@@ -1554,163 +1554,6 @@ namespace SongBrowser.UI
 
             return noteJumpSpeed;
         }
-
-#if DEBUG
-        /// <summary>
-        /// Not normally called by the game-engine.  Dependent on SongBrowserApplication to call it.
-        /// </summary>
-        public void LateUpdate()
-        {
-            CheckDebugUserInput();
-        }
-
-        /// <summary>
-        /// Map some key presses directly to UI interactions to make testing easier.
-        /// </summary>
-        private void CheckDebugUserInput()
-        {
-            try
-            {
-                if (this._levelPackLevelsViewController != null && this._levelPackLevelsViewController.isActiveAndEnabled)
-                {
-                    bool isShiftKeyDown = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
-
-                    if (isShiftKeyDown && Input.GetKeyDown(KeyCode.X))
-                    {
-                        this._beatmapCharacteristicSelectionViewController.HandleDifficultySegmentedControlDidSelectCell(null, 1);
-                    }
-                    else if (Input.GetKeyDown(KeyCode.X))
-                    {
-                        this._beatmapCharacteristicSelectionViewController.HandleDifficultySegmentedControlDidSelectCell(null, 0);
-                    }
-
-                    // back
-                    if (Input.GetKeyDown(KeyCode.Escape))
-                    {
-                        this._levelSelectionNavigationController.GoBackButtonPressed();
-                    }
-                    
-                    // select current sort mode again (toggle inverting)
-                    if (isShiftKeyDown && Input.GetKeyDown(KeyCode.BackQuote))
-                    {
-                        _sortButtonGroup[_sortButtonLastPushedIndex].Button.onClick.Invoke();
-                    }
-                    // cycle sort modes
-                    else if (Input.GetKeyDown(KeyCode.BackQuote))
-                    {
-                        _sortButtonLastPushedIndex = (_sortButtonLastPushedIndex + 1) % _sortButtonGroup.Count;
-                        _sortButtonGroup[_sortButtonLastPushedIndex].Button.onClick.Invoke();
-                    }
-
-                    // filter favorites
-                    if (Input.GetKeyDown(KeyCode.F1))
-                    {
-                        OnFavoriteFilterButtonClickEvent();
-                    }
-
-                    // filter playlists
-                    if (Input.GetKeyDown(KeyCode.F2))
-                    {
-                        OnPlaylistButtonClickEvent();
-                    }
-
-                    // filter search
-                    if (Input.GetKeyDown(KeyCode.F3))
-                    {
-                        OnSearchButtonClickEvent();
-                    }
-
-                    // delete
-                    if (Input.GetKeyDown(KeyCode.Delete))
-                    {
-                        _deleteButton.onClick.Invoke();
-                    }
-
-                    // c - select difficulty for top song
-                    if (Input.GetKeyDown(KeyCode.C))
-                    {
-                        _levelPacksTableView.SelectCellWithIdx(5);
-                        _levelPacksTableView.HandleDidSelectColumnEvent(null, 2);
-
-                        TableView listTableView = this._levelPackLevelsTableView.GetPrivateField<TableView>("_tableView");
-                        this._levelPackLevelsTableView.HandleDidSelectRowEvent(listTableView, 2);
-                        listTableView.ScrollToCellWithIdx(2, TableView.ScrollPositionType.Beginning, false);
-
-                        //this._levelDifficultyViewController.HandleDifficultySegmentedControlDidSelectCell(null, 0);
-                    }
-
-                    // v - select difficulty for top song
-                    if (Input.GetKeyDown(KeyCode.V))
-                    {
-                        this.SelectAndScrollToLevel(_levelPackLevelsTableView, _model.SortedSongList[0].levelID);
-                        this._levelDifficultyViewController.HandleDifficultySegmentedControlDidSelectCell(null, 0);
-                    }
-
-                    // return - start a song
-                    if (Input.GetKeyDown(KeyCode.Return))
-                    {
-                        if (_playButton.isActiveAndEnabled)
-                        {
-                            _playButton.onClick.Invoke();
-                        }
-                    }
-
-                    // change song index
-                    if (isShiftKeyDown && Input.GetKeyDown(KeyCode.N))
-                    {
-                        _pageUpFastButton.onClick.Invoke();
-                    }
-                    else if (Input.GetKeyDown(KeyCode.N))
-                    {
-                        _lastRow = (_lastRow - 1) != -1 ? (_lastRow - 1) % this._model.SortedSongList.Count : 0;
-                        this.SelectAndScrollToLevel(_levelPackLevelsTableView, _model.SortedSongList[_lastRow].levelID);
-                    }
-
-                    if (isShiftKeyDown && Input.GetKeyDown(KeyCode.M))
-                    {
-                        _pageDownFastButton.onClick.Invoke();
-                    }
-                    else if (Input.GetKeyDown(KeyCode.M))
-                    {                        
-                        _lastRow = (_lastRow + 1) % this._model.SortedSongList.Count;
-                        this.SelectAndScrollToLevel(_levelPackLevelsTableView, _model.SortedSongList[_lastRow].levelID);
-                    }
-
-                    // add to favorites
-                    if (Input.GetKeyDown(KeyCode.KeypadPlus))
-                    {
-                        ToggleSongInPlaylist();
-                    }
-                }
-                else if (_deleteDialog != null && _deleteDialog.isInViewControllerHierarchy)
-                {
-                    // accept delete
-                    if (Input.GetKeyDown(KeyCode.Return))
-                    {
-                        _deleteDialog.GetPrivateField<Button>("_okButton").onClick.Invoke();
-                    }
-
-                    if (Input.GetKeyDown(KeyCode.Escape))
-                    {
-                        _deleteDialog.GetPrivateField<Button>("_cancelButton").onClick.Invoke();
-                    }
-                }
-                else
-                {
-                    if (Input.GetKeyDown(KeyCode.B))
-                    {
-                        Logger.Debug("Invoking OK Button");
-                        VRUIViewController view = Resources.FindObjectsOfTypeAll<VRUIViewController>().First(x => x.name == "StandardLevelResultsViewController");
-                        view.GetComponentsInChildren<Button>().First(x => x.name == "Ok").onClick.Invoke();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.Exception("Debug Input caused Exception: ", e);
-            }
-        }
-#endif
     }
 }
  

SongBrowserPlugin/UI/Keyboard/SearchKeyboardViewController.cs

@@ -75,42 +75,5 @@ namespace SongBrowser.UI
             _inputString = "";
             backButtonPressed?.Invoke();
         }
-
-#if DEBUG
-        /// <summary>
-        /// Emulate keyboard support.
-        /// </summary>
-        private void LateUpdate()
-        {
-            if (!this.isInViewControllerHierarchy) return;
-
-            if (Input.GetKeyDown(KeyCode.KeypadEnter) || Input.GetKeyDown(KeyCode.Return))
-            {
-                _searchKeyboard.OkButtonWasPressed();
-            }
-            else if (Input.GetKeyDown(KeyCode.Backspace))
-            {
-                this._searchKeyboard.DeleteButtonWasPressed();
-            }
-            else if (Input.GetKeyDown(KeyCode.Space))
-            {
-                this._searchKeyboard.KeyPressed(' ');
-            }
-            else if (Input.GetKeyDown(KeyCode.Escape))
-            {
-                this.Back();
-            }
-
-            IEnumerable<KeyCode> keycodeIterator = Enum.GetValues(typeof(KeyCode)).Cast<KeyCode>();
-            foreach (KeyCode keycode in keycodeIterator)
-            {
-                if (!((keycode >= KeyCode.A && keycode <= KeyCode.Z) || (keycode >= KeyCode.Alpha0 && keycode <= KeyCode.Alpha9))) continue;
-                if (Input.GetKeyDown(keycode))
-                {
-                    this._searchKeyboard.KeyPressed(keycode.ToString().ToCharArray()[0]);
-                }
-            }      
-        }
-#endif
     }
 }

SongBrowserPlugin/UI/Playlists/PlaylistFlowCoordinator.cs

@@ -238,32 +238,5 @@ namespace SongBrowser.UI
                 didFinishEvent?.Invoke(null);
             }
         }
-
-#if DEBUG
-        /// <summary>
-        /// Useful playlist navigation.
-        /// Shift+Enter downloads.
-        /// Enter selects.
-        /// </summary>
-        public void LateUpdate()
-        {
-            bool isShiftKeyDown = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
-
-            if (isShiftKeyDown && Input.GetKeyDown(KeyCode.Return))
-            {
-                _playlistDetailViewController_downloadButtonPressed(_lastPlaylist);
-            }
-            else if (Input.GetKeyDown(KeyCode.Return))
-            {
-                _playlistDetailViewController_selectButtonPressed(_lastPlaylist);
-            }
-
-            // leave
-            if (Input.GetKeyDown(KeyCode.Escape))
-            {
-                _playlistsNavigationController_didFinishEvent();
-            }
-        }
-#endif
     }
 }

SongBrowserPlugin/UI/Playlists/PlaylistSelectionListViewController.cs

@@ -176,43 +176,5 @@ namespace SongBrowser.UI
 
             return _tableCell;
         }
-
-#if DEBUG
-        private void LateUpdate()
-        {
-            CheckDebugUserInput();
-        }
-
-        private void CheckDebugUserInput()
-        {
-            bool isShiftKeyDown = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
-
-            if (Input.GetKeyDown(KeyCode.N) && isShiftKeyDown)
-            {
-                _songsTableView.PageScrollUp();
-            }
-            else if (Input.GetKeyDown(KeyCode.N))
-            {
-                _lastSelectedRow = (_lastSelectedRow - 1) % _songsTableView.dataSource.NumberOfCells();
-                if (_lastSelectedRow < 0)
-                {
-                    _lastSelectedRow = _songsTableView.dataSource.NumberOfCells() - 1;
-                }
-                _songsTableView.ScrollToCellWithIdx(_lastSelectedRow, TableView.ScrollPositionType.Beginning, false);
-                this._songsTableView_DidSelectRowEvent(_songsTableView, _lastSelectedRow);
-            }
-
-            if (Input.GetKeyDown(KeyCode.M) && isShiftKeyDown)
-            {
-                _songsTableView.PageScrollDown();
-            }
-            else if (Input.GetKeyDown(KeyCode.M))
-            {
-                _lastSelectedRow = (_lastSelectedRow + 1) % _songsTableView.dataSource.NumberOfCells();
-                _songsTableView.ScrollToCellWithIdx(_lastSelectedRow, TableView.ScrollPositionType.End, false);
-                this._songsTableView_DidSelectRowEvent(_songsTableView, _lastSelectedRow);
-            }
-        }
-#endif
     }
 }

SongBrowserPlugin/UI/ScoreSaberDatabaseDownloader.cs

@@ -44,11 +44,6 @@ namespace SongBrowser.UI
             StartCoroutine(WaitForDownload());
         }
 
-        private void DownloadScoreSaberData()
-        {
-
-        }
-
         /// <summary>
         /// Wait for score saber related files to download.
         /// </summary>