Small refactor.

Move SongBrowserModel creation and init outside SongBrowserUI.
Add StarEmpty icon.
Clean up some unused imports.

SongBrowserPlugin/PluginConfig.cs

@@ -1,13 +1,7 @@
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Xml.Serialization;
-using SongBrowser;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Logger = SongBrowser.Logging.Logger;
 using IPA.Config;
 

SongBrowserPlugin/SongBrowserApplication.cs

@@ -16,9 +16,17 @@ namespace SongBrowser
 
         // Song Browser UI Elements
         private SongBrowserUI _songBrowserUI;
+        private SongBrowserModel _songBrowserModel;
 
         public static SongBrowser.UI.ProgressBar MainProgressBar;
 
+        public SongBrowserModel Model
+        {
+            get
+            {
+                return _songBrowserModel;
+            }
+        }
 
         /// <summary>
         /// Load the main song browser app.
@@ -46,7 +54,13 @@ namespace SongBrowser
 
             Instance = this;
 
+            // Init Model, load settings
+            _songBrowserModel = new SongBrowserModel();
+            _songBrowserModel.Init();
+
+            // Init browser UI
             _songBrowserUI = gameObject.AddComponent<SongBrowserUI>();
+            _songBrowserUI.Model = _songBrowserModel;
         }
 
         /// <summary>
@@ -111,7 +125,7 @@ namespace SongBrowser
             Logger.Trace("OnScoreSaberDataDownloaded");
             try
             {
-                if (_songBrowserUI.Model.Settings.sortMode.NeedsScoreSaberData())
+                if (_songBrowserModel.Settings.sortMode.NeedsScoreSaberData())
                 {
                     _songBrowserUI.ProcessSongList();
                     _songBrowserUI.RefreshSongUI();
@@ -135,7 +149,7 @@ namespace SongBrowser
             Logger.Trace("OnBeatSaverDataDownloaded");
             try
             {
-                if (_songBrowserUI.Model.Settings.sortMode.NeedsBeatSaverData())
+                if (_songBrowserModel.Settings.sortMode.NeedsBeatSaverData())
                 {
                     _songBrowserUI.ProcessSongList();
                     _songBrowserUI.RefreshSongUI();

SongBrowserPlugin/UI/Base64Sprites.cs

@@ -11,6 +11,7 @@ namespace SongBrowser.UI
         public static Sprite AddToFavoritesIcon;
         public static Sprite RemoveFromFavoritesIcon;
         public static Sprite StarFullIcon;
+        public static Sprite StarEmptyIcon;
         public static Sprite DownloadIcon;
         public static Sprite SpeedIcon;
         public static Sprite GraphIcon;
@@ -26,11 +27,11 @@ namespace SongBrowser.UI
             SpeedIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.Speed.png");
             GraphIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.Graph.png");
             XIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.X.png");
-
             AddToFavoritesIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.AddToFavorites.png");
             PlaylistIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.PlaylistIcon.png");
             RemoveFromFavoritesIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.RemoveFromFavorites.png");
             StarFullIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.StarFull.png");
+            StarEmptyIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.StarEmpty.png");
             DownloadIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.DownloadIcon.png");
             DeleteIcon = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.DeleteIcon.png");
             DoubleArrow = CustomUI.Utilities.UIUtilities.LoadSpriteFromResources("SongBrowser.Assets.DoubleArrow.png");

SongBrowserPlugin/UI/Browser/SongBrowserUI.cs

@@ -73,12 +73,11 @@ namespace SongBrowser.UI
 
         // Model
         private SongBrowserModel _model;
-
         public SongBrowserModel Model
         {
-            get
+            set
             {
-                return _model;
+                _model = value;
             }
         }
 
@@ -87,19 +86,6 @@ namespace SongBrowser.UI
         private UIState _currentUiState = UIState.Disabled;
 
         /// <summary>
-        /// Constructor
-        /// </summary>
-        public SongBrowserUI() : base()
-        {
-            if (_model == null)
-            {
-                _model = new SongBrowserModel();
-            }
-
-            _model.Init();
-        }
-
-        /// <summary>
         /// Builds the UI for this plugin.
         /// </summary>
         public void CreateUI(MainMenuViewController.MenuButton mode)