Slight simplifications to the codebase

Author: yasirkula

Plugins/SimpleFileBrowser/Scripts/EventSystemHandler.cs

@@ -11,10 +11,8 @@ namespace SimpleFileBrowser
 	[DefaultExecutionOrder( 1000 )]
 	public class EventSystemHandler : MonoBehaviour
 	{
-#pragma warning disable 0649
 		[SerializeField]
 		private GameObject embeddedEventSystem;
-#pragma warning restore 0649
 
 #if ENABLE_INPUT_SYSTEM && !ENABLE_LEGACY_INPUT_MANAGER
 		private void Awake()

Plugins/SimpleFileBrowser/Scripts/FileBrowser.cs

@@ -197,13 +197,11 @@ public static event FileSystemEntryFilter DisplayedEntriesFilter
 			add
 			{
 				Instance.m_displayedEntriesFilter += value;
-				m_instance.PersistFileEntrySelection();
 				m_instance.RefreshFiles( false );
 			}
 			remove
 			{
 				Instance.m_displayedEntriesFilter -= value;
-				m_instance.PersistFileEntrySelection();
 				m_instance.RefreshFiles( false );
 			}
 		}
@@ -352,7 +350,6 @@ public static FileBrowser Instance
 		#endregion
 
 		#region Variables
-#pragma warning disable 0649
 		[Header( "Settings" )]
 		[SerializeField]
 		internal int minWidth = 380;
@@ -507,7 +504,6 @@ public static FileBrowser Instance
 
 		[SerializeField]
 		private FileBrowserCursorHandler resizeCursorHandler;
-#pragma warning restore 0649
 
 		internal RectTransform rectTransform;
 		private Canvas canvas;
@@ -676,7 +672,7 @@ private string CurrentPath
 				}
 
 				m_multiSelectionToggleSelectionMode = false;
-				RefreshFiles( true );
+                RefreshFiles(true, false);
 			}
 		}
 
@@ -780,6 +776,7 @@ private string LastBrowsedFolder
 		public delegate void OnSuccess( string[] paths );
 		public delegate void OnCancel();
 		public delegate bool FileSystemEntryFilter( FileSystemEntry entry );
+        public delegate bool SearchPredicate(FileSystemEntry entry, string searchTerm);
 		public delegate void PermissionCallback( Permission permission );
 #if UNITY_EDITOR || UNITY_ANDROID
 		public delegate void AndroidSAFDirectoryPickCallback( string rawUri, string name );
@@ -962,13 +959,11 @@ private void LateUpdate()
 #endif
 		}
 
-		private void OnApplicationFocus( bool focus )
-		{
-			if( !focus )
-				PersistFileEntrySelection();
-			else
-				RefreshFiles( true );
-		}
+        private void OnApplicationFocus(bool focus)
+        {
+            if (focus)
+                RefreshFiles(true);
+        }
 		#endregion
 
 		#region Interface Methods
@@ -1694,7 +1689,6 @@ private void OnSearchStringChanged( string newSearchString )
 			if( !canvas ) // Same as OnPathChanged
 				return;
 
-			PersistFileEntrySelection();
 			SearchString = newSearchString;
 		}
 
@@ -1712,7 +1706,6 @@ private void OnFilterChanged( int value )
 				extensionsSingleSuffixModeChanged = ( AllExtensionsHaveSingleSuffix != allExtensionsHadSingleSuffix );
 			}
 
-			PersistFileEntrySelection();
 			RefreshFiles( extensionsSingleSuffixModeChanged );
 		}
 
@@ -1721,7 +1714,6 @@ private void OnShowHiddenFilesToggleChanged( bool value )
 			if( !canvas ) // Same as OnPathChanged
 				return;
 
-			PersistFileEntrySelection();
 			RefreshFiles( false );
 		}
 
@@ -2016,10 +2008,17 @@ public void Hide()
 			gameObject.SetActive( false );
 		}
 
-		public void RefreshFiles( bool pathChanged )
-		{
+        public void RefreshFiles(bool pathChanged, bool preserveSelection = true)
+        {
 			bool allExtensionsHaveSingleSuffix = AllExtensionsHaveSingleSuffix;
 
+            if (preserveSelection)
+            {
+                pendingFileEntrySelection.Clear();
+                for (int i = 0; i < selectedFileEntries.Count; i++)
+                    pendingFileEntrySelection.Add(validFileEntries[selectedFileEntries[i]].Name);
+            }
+
 			if( pathChanged )
 			{
 				if( !string.IsNullOrEmpty( m_currentPath ) )
@@ -2099,7 +2098,7 @@ public void RefreshFiles( bool pathChanged )
 
 			// Prevent the case where all the content stays offscreen after changing the search string
 			EnsureScrollViewIsWithinBounds();
-		}
+        }
 
 		// Returns whether or not the FileSystemEntry passes the file browser's filters and should be displayed in the files list
 		private bool FileSystemEntryMatchesFilters( in FileSystemEntry item, bool allExtensionsHaveSingleSuffix )
@@ -2237,7 +2236,7 @@ private IEnumerator CreateNewFolderCoroutine()
 				pendingFileEntrySelection.Clear();
 				pendingFileEntrySelection.Add( folderName );
 
-				RefreshFiles( true );
+                RefreshFiles(true, false);
 
 				if( m_pickerMode != PickMode.Files )
 					filenameInputField.text = folderName;
@@ -2302,7 +2301,7 @@ public void RenameSelectedFile()
 				pendingFileEntrySelection.Clear();
 				pendingFileEntrySelection.Add( newName );
 
-				RefreshFiles( true );
+                RefreshFiles(true, false);
 
 				if( ( fileInfo.IsDirectory && m_pickerMode != PickMode.Files ) || ( !fileInfo.IsDirectory && m_pickerMode != PickMode.Folders ) )
 					filenameInputField.text = newName;
@@ -2331,18 +2330,10 @@ public void DeleteSelectedFiles()
 				selectedFileEntries.Clear();
 
 				MultiSelectionToggleSelectionMode = false;
-				RefreshFiles( true );
+                RefreshFiles(true, false);
 			} );
 		}
 
-		// Makes sure that the selection persists after Refreshing the file entries
-		private void PersistFileEntrySelection()
-		{
-			pendingFileEntrySelection.Clear();
-			for( int i = 0; i < selectedFileEntries.Count; i++ )
-				pendingFileEntrySelection.Add( validFileEntries[selectedFileEntries[i]].Name );
-		}
-
 		private bool AddQuickLink( Sprite icon, string name, string path )
 		{
 			if( string.IsNullOrEmpty( path ) )

Plugins/SimpleFileBrowser/Scripts/FileBrowserAccessRestrictedPanel.cs

@@ -10,7 +10,6 @@ namespace SimpleFileBrowser
 {
 	public class FileBrowserAccessRestrictedPanel : MonoBehaviour
 	{
-#pragma warning disable 0649
 		[SerializeField]
 		private HorizontalLayoutGroup contentLayoutGroup;
 
@@ -19,7 +18,6 @@ public class FileBrowserAccessRestrictedPanel : MonoBehaviour
 
 		[SerializeField]
 		private Button okButton;
-#pragma warning restore 0649
 
 		private void Awake()
 		{

Plugins/SimpleFileBrowser/Scripts/FileBrowserContextMenu.cs

@@ -6,7 +6,6 @@ namespace SimpleFileBrowser
 {
 	public class FileBrowserContextMenu : MonoBehaviour
 	{
-#pragma warning disable 0649
 		[SerializeField]
 		private FileBrowser fileBrowser;
 
@@ -36,7 +35,6 @@ public class FileBrowserContextMenu : MonoBehaviour
 
 		[SerializeField]
 		private float minDistanceToEdges = 10f;
-#pragma warning restore 0649
 
 		private void Awake()
 		{

Plugins/SimpleFileBrowser/Scripts/FileBrowserCursorHandler.cs

@@ -9,10 +9,8 @@ public class FileBrowserCursorHandler : MonoBehaviour
 #endif
 	{
 #if UNITY_EDITOR || ( !UNITY_ANDROID && !UNITY_IOS )
-#pragma warning disable 0649
 		[SerializeField]
 		private Texture2D resizeCursor;
-#pragma warning restore 0649
 
 		private bool isHovering;
 		private bool isResizing;

Plugins/SimpleFileBrowser/Scripts/FileBrowserFileOperationConfirmationPanel.cs

@@ -14,7 +14,6 @@ public enum OperationType { Delete = 0, Overwrite = 1 };
 
 		public delegate void OnOperationConfirmed();
 
-#pragma warning disable 0649
 		[SerializeField]
 		private VerticalLayoutGroup contentLayoutGroup;
 
@@ -44,7 +43,6 @@ public enum OperationType { Delete = 0, Overwrite = 1 };
 
 		[SerializeField]
 		private float narrowScreenWidth = 380f;
-#pragma warning restore 0649
 
 		private OnOperationConfirmed onOperationConfirmed;
 

Plugins/SimpleFileBrowser/Scripts/FileBrowserItem.cs

@@ -18,7 +18,6 @@ public class FileBrowserItem : ListItem, IPointerClickHandler, IPointerDownHandl
 		#region Variables
 		protected FileBrowser fileBrowser;
 
-#pragma warning disable 0649
 		[SerializeField]
 		private Image background;
 
@@ -31,7 +30,6 @@ public class FileBrowserItem : ListItem, IPointerClickHandler, IPointerDownHandl
 
 		[SerializeField]
 		private TextMeshProUGUI nameText;
-#pragma warning restore 0649
 
 #pragma warning disable 0414
 		private bool isSelected, isHidden;

Plugins/SimpleFileBrowser/Scripts/FileBrowserMovement.cs

@@ -6,7 +6,6 @@ namespace SimpleFileBrowser
 	public class FileBrowserMovement : MonoBehaviour
 	{
 		#region Variables
-#pragma warning disable 0649
 		private FileBrowser fileBrowser;
 		private RectTransform canvasTR;
 		private Camera canvasCam;
@@ -16,7 +15,6 @@ public class FileBrowserMovement : MonoBehaviour
 
 		[SerializeField]
 		private RecycledListView listView;
-#pragma warning restore 0649
 
 		private Vector2 initialTouchPos = Vector2.zero;
 		private Vector2 initialAnchoredPos, initialSizeDelta;

Plugins/SimpleFileBrowser/Scripts/FileBrowserRenamedItem.cs

@@ -12,7 +12,6 @@ public class FileBrowserRenamedItem : MonoBehaviour
 	{
 		public delegate void OnRenameCompleted( string filename );
 
-#pragma warning disable 0649
 		[SerializeField]
 		private Image background;
 
@@ -22,7 +21,6 @@ public class FileBrowserRenamedItem : MonoBehaviour
 		[SerializeField]
 		private TMP_InputField nameInputField;
 		public TMP_InputField InputField { get { return nameInputField; } }
-#pragma warning restore 0649
 
 		private OnRenameCompleted onRenameCompleted;
 

Plugins/SimpleFileBrowser/Scripts/SimpleRecycledListView/RecycledListView.cs

@@ -11,7 +11,6 @@ public class RecycledListView : MonoBehaviour
 		, IPointerClickHandler
 #endif
 	{
-#pragma warning disable 0649
 #if UNITY_EDITOR || UNITY_STANDALONE || UNITY_WSA || UNITY_WSA_10_0
 		[SerializeField]
 		private FileBrowser fileBrowser;
@@ -22,7 +21,6 @@ public class RecycledListView : MonoBehaviour
 		private RectTransform viewportTransform;
 		[SerializeField]
 		private RectTransform contentTransform;
-#pragma warning restore 0649
 
 		private float itemHeight, _1OverItemHeight;
 		private float viewportHeight;