Prechádzať zdrojové kódy

Fix filtering, search keyboard shows up, wall of exceptions.

Halsafar 4 rokov pred
rodič
commit
24bfaf2efd

+ 3 - 3
SongBrowserPlugin/UI/Browser/SongBrowserUI.cs

@@ -5,13 +5,13 @@ using System.Collections.Generic;
 using UnityEngine.UI;
 using HMUI;
 using SongBrowser.DataAccess;
-using TMPro;
 using Logger = SongBrowser.Logging.Logger;
 using System.Collections;
 using SongCore.Utilities;
 using SongBrowser.Internals;
 using SongDataCore.BeatStar;
 
+
 namespace SongBrowser.UI
 {
     public enum UIState
@@ -331,7 +331,7 @@ namespace SongBrowser.UI
 
             SongFilterMode[] filterModes = new SongFilterMode[]
             {
-                    SongFilterMode.Favorites, SongFilterMode.Search, SongFilterMode.Ranked, SongFilterMode.Unranked
+                    SongFilterMode.Search, SongFilterMode.Ranked, SongFilterMode.Unranked
             };
 
             _filterButtonGroup = new List<SongFilterButton>();
@@ -991,7 +991,7 @@ namespace SongBrowser.UI
             }
 
             Logger.Debug("Presenting search keyboard");
-            _beatUi.LevelSelectionFlowCoordinator.InvokePrivateMethod("PresentViewController", new object[] { _searchViewController, null, false });
+            _beatUi.LevelSelectionFlowCoordinator.InvokePrivateMethod("PresentViewController", new object[] { _searchViewController, null, ViewController.AnimationDirection.Horizontal, false });
         }
 
         /// <summary>

+ 1 - 1
SongBrowserPlugin/UI/Keyboard/SearchKeyboardViewController.cs

@@ -24,7 +24,7 @@ namespace SongBrowser.UI
         {
             if (addedToHierarchy && firstActivation)
             {
-                _searchKeyboardGO = Instantiate(Resources.FindObjectsOfTypeAll<UIKeyboard>().First(x => x.name != "CustomUIKeyboard"), rectTransform, false).gameObject;
+                _searchKeyboardGO = Instantiate(Resources.FindObjectsOfTypeAll<HMUI.UIKeyboard>().First(x => x.name != "CustomUIKeyboard"), rectTransform, false).gameObject;
 
                 Destroy(_searchKeyboardGO.GetComponent<UIKeyboard>());
                 _searchKeyboard = _searchKeyboardGO.AddComponent<CustomUIKeyboard>();