[edit] darken terminal background, refactor pagination rendering with ANSI colors, code cleanup

Author: i4004

src/EtcdTerminal.App/Program.cs

@@ -3,7 +3,7 @@
 using Simplify.DI;
 using Spectre.Console;
 
-const string SetBgCommand = "\x1b]11;#100b09\x07";
+const string SetBgCommand = "\x1b]11;#0a0a0a\x07";
 const string ResetBgCommand = "\x1b]111\x07";
 const string PressAnyKeyRestart = "\n[grey]Press any key to restart...[/]";
 

src/EtcdTerminal.App/Screens/KeyBrowseScreen.cs

@@ -84,9 +84,7 @@ async Task<List<EtcdKeyValue>> LoadAllKeysAsync()
 			var user = await _etcdClient.GetUserAsync(username);
 
 			if (user is null || user.Roles.Count == 0 || user.Roles.Contains("root"))
-			{
 				_allKeys = await LoadAllKeysAsync();
-			}
 			else
 			{
 				var keys = new List<EtcdKeyValue>();
@@ -236,15 +234,20 @@ private void RenderSearchBar()
 		Console.WriteLine();
 
 		Console.Write(bgSeq);
+
 		if (_searchQuery.Length == 0)
 			AnsiConsole.Markup("[grey]  \U0001f50d  Type to search keys...[/]");
 		else
 			AnsiConsole.Markup($"  \U0001f50d [white]{Markup.Escape(_searchQuery)}[/]");
+
 		_searchEndCol = Console.CursorLeft;
 		_searchBarRow = Console.CursorTop;
+
 		var remaining = Console.WindowWidth - _searchEndCol;
+
 		if (remaining > 0)
 			Console.Write(bgSeq + new string(' ', remaining) + resetSeq);
+
 		Console.WriteLine();
 
 		Console.Write(bgSeq + fill + resetSeq);
@@ -284,6 +287,8 @@ private void RenderKeyList()
 	private void RenderPagination()
 	{
 		var bgSeq = "\x1b[48;2;27;28;30m";
+		var greySeq = "\x1b[38;2;128;128;128m";
+		var whiteSeq = "\x1b[38;2;255;255;255m";
 		var resetSeq = "\x1b[0m";
 		var fill = new string(' ', Console.WindowWidth);
 
@@ -294,13 +299,13 @@ private void RenderPagination()
 		Console.Write(bgSeq + fill + resetSeq);
 		Console.WriteLine();
 
-		Console.Write(bgSeq);
-		AnsiConsole.Markup($"[grey]  Page {currentPageLabel}/{totalPages}  •  {totalKeys} total keys[/]");
+		Console.Write(bgSeq + greySeq + "  Page " + whiteSeq + currentPageLabel + "/" + totalPages + greySeq + "  •  " + whiteSeq + totalKeys + greySeq + " total keys" + resetSeq);
 		var remaining = Console.WindowWidth - Console.CursorLeft;
+
 		if (remaining > 0)
 			Console.Write(bgSeq + new string(' ', remaining) + resetSeq);
-		Console.WriteLine();
 
+		Console.WriteLine();
 		Console.Write(bgSeq + fill + resetSeq);
 	}
 
@@ -328,7 +333,9 @@ private async Task EditKeyAsync()
 
 		AnsiConsole.Clear();
 		Header.Render();
+
 		var savedTop = Console.CursorTop;
+
 		StatusBar.Render(_config);
 		Console.CursorTop = savedTop;
 		Console.CursorLeft = 0;
@@ -345,20 +352,21 @@ private async Task EditKeyAsync()
 
 		AnsiConsole.Clear();
 		Header.Render();
+
 		savedTop = Console.CursorTop;
+
 		StatusBar.Render(_config);
 		Console.CursorTop = savedTop;
 		Console.CursorLeft = 0;
 
 		if (result)
 		{
 			AnsiConsole.MarkupLine(KeyUpdated);
+
 			await ReloadAsync();
 		}
 		else
-		{
 			AnsiConsole.MarkupLine(CouldNotUpdateKey);
-		}
 
 		Console.WriteLine();
 		AnsiConsole.Markup(Prompt.PressAnyKeyMarkup);
@@ -372,7 +380,9 @@ private async Task DeleteKeyAsync()
 
 		AnsiConsole.Clear();
 		Header.Render();
+
 		var savedTop = Console.CursorTop;
+
 		StatusBar.Render(_config);
 		Console.CursorTop = savedTop;
 		Console.CursorLeft = 0;
@@ -388,20 +398,21 @@ private async Task DeleteKeyAsync()
 
 		AnsiConsole.Clear();
 		Header.Render();
+
 		savedTop = Console.CursorTop;
+
 		StatusBar.Render(_config);
 		Console.CursorTop = savedTop;
 		Console.CursorLeft = 0;
 
 		if (result)
 		{
 			AnsiConsole.MarkupLine(KeyDeleted);
+
 			await ReloadAsync();
 		}
 		else
-		{
 			AnsiConsole.MarkupLine(KeyCouldNotBeDeleted);
-		}
 
 		Console.WriteLine();
 		AnsiConsole.Markup(Prompt.PressAnyKeyMarkup);
@@ -423,9 +434,7 @@ private async Task ReloadAsync()
 	private void ApplyFilter()
 	{
 		if (string.IsNullOrEmpty(_searchQuery))
-		{
 			_filteredKeys = [.. _allKeys];
-		}
 		else
 		{
 			var query = _searchQuery;
@@ -444,7 +453,7 @@ private List<EtcdKeyValue> GetCurrentPageKeys()
 	{
 		var start = _currentPage * PageSize;
 
-		return _filteredKeys.Skip(start).Take(PageSize).ToList();
+		return [.. _filteredKeys.Skip(start).Take(PageSize)];
 	}
 
 	private EtcdKeyValue? GetCurrentPageKey()