diff --git a/lib/event_ds.dart b/lib/event_ds.dart index f212629..4d26f0d 100644 --- a/lib/event_ds.dart +++ b/lib/event_ds.dart @@ -12,7 +12,7 @@ import 'package:kepler/kepler.dart'; int gDebug = 0; - +String getStrInColor(String s, String commentColor) => stdout.supportsAnsiEscapes ?"$commentColor$s$gColorEndMarker":s; // translate GoogleTranslator? translator; // initialized in main when argument given @@ -276,7 +276,6 @@ class EventData { int n = 4; String maxN(String v) => v.length > n? v.substring(0,n) : v.substring(0, v.length); void printInColor(String s, String commentColor) => stdout.supportsAnsiEscapes ?stdout.write("$commentColor$s$gColorEndMarker"):stdout.write(s); - String getStrInColor(String s, String commentColor) => stdout.supportsAnsiEscapes ?"$commentColor$s$gColorEndMarker":s; String name = getAuthorName(pubkey); String strDate = getPrintableDate(createdAt); @@ -423,7 +422,11 @@ class EventData { const int nameWidthDepth = 16~/gSpacesPerDepth; // how wide name will be in depth spaces const int timeWidthDepth = 16~/gSpacesPerDepth; int nameWidth = gSpacesPerDepth * nameWidthDepth; + + // get name in color and pad it too String nameToPrint = name.padLeft(nameWidth).substring(0, nameWidth); + nameToPrint = getStrInColor(nameToPrint, getNameColor(name)); + String dateToPrint = strDate.padLeft(gSpacesPerDepth * timeWidthDepth).substring(0, gSpacesPerDepth * timeWidthDepth); strToPrint = "${getDepthSpaces(depth)} $dateToPrint $nameToPrint: "; diff --git a/lib/settings.dart b/lib/settings.dart index dad82d1..9b168ae 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -107,10 +107,10 @@ const int leftShiftThreadsBy = 3; // Color related settings const String defaultTextColor = "green"; const String greenColor = "\x1B[32m"; // green -const String yelloColor = "\x1B[33m"; // yellow +const String yellowColor = "\x1B[33m"; // yellow const String magentaColor = "\x1B[35m"; // magenta const String cyanColor = "\x1b[36m"; // cyan -const String whiteColor = "\x1b[97m"; // white +const String whiteColor = "\x1b[37m"; // white const String blackColor = "\x1b[30m"; // black const String redColor = "\x1B[31m"; // red const String blueColor = "\x1b[34m"; // blue @@ -122,13 +122,14 @@ Map gColorMapForArguments = { "green": greenColor, "red" : redColor, "blue" : blueColor}; +const String brightBlackColor = "\x1b[90m"; // bright black const String brightRedColor = "\x1B[91m"; // bright red const String brightGreenColor = "\x1B[92m"; // bright green const String brightYellowColor = "\x1B[93m"; // bright yellow const String brightBlueColor = "\x1B[94m"; // bright blue const String brightCyanColor = "\x1B[96m"; // bright cyan const String brightMagentaColor = "\x1B[95m"; // bright magenta - +const String brightWhiteColor = "\x1b[97m"; // white // 33 yellow, 31 red, 34 blue, 35 magenta. Add 60 for bright versions. String gCommentColor = greenColor; @@ -136,18 +137,21 @@ String gNotificationColor = cyanColor; // cyan String gWarningColor = redColor; // red const String gColorEndMarker = "\x1B[0m"; -List nameColorPalette = [brightGreenColor, brightCyanColor, brightYellowColor, brightMagentaColor, brightBlueColor, brightRedColor, - yelloColor, magentaColor, redColor ]; +// blue is too bright +List nameColorPalette = [brightGreenColor, brightCyanColor, brightYellowColor, brightMagentaColor, + brightBlueColor, brightRedColor, brightBlackColor, brightWhiteColor, + yellowColor, magentaColor, redColor ]; String getNameColor( String name) { if( name.length == 0) return nameColorPalette[0]; - int offset = name.substring(0, 1).codeUnits[0] % nameColorPalette.length; + int offset = name.substring(0, 1).toLowerCase().codeUnits[0] % nameColorPalette.length; return nameColorPalette[offset]; } + // By default the threads that were started in last one day are shown // this can be changed with 'days' command line argument const int gDefaultNumLastDays = 1; @@ -170,7 +174,7 @@ const int gMaxDifficultyAllowed = 24; int gDifficulty = 0; //////////////////////////////////////////////////////////////////////////////////////////////////////////////// channel related settings -const int gNumChannelMessagesToShow = 25; +const int gNumChannelMessagesToShow = 30; const int gMaxChannelPagesDisplayed = 50;