Refactor icons.

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

icons/ascii.json

@@ -4,5 +4,8 @@
     "like":   "*",
     "unlike": " ",
     "lock":   "$",
-    "none":   " "
+    "empty":  " ",
+    "ac":     "O",
+    "notac":  "X",
+    "none":   "o"
 }

icons/default.json

@@ -4,5 +4,8 @@
     "like":   "★",
     "unlike": "☆",
     "lock":   "🔒",
-    "none":   " "
+    "empty":  " ",
+    "ac":     "▣",
+    "notac":  "▤",
+    "none":   "⬚"
 }

icons/win7.json

@@ -3,5 +3,9 @@
     "no":     "×",
     "like":   "♥",
     "unlike": " ",
-    "lock":   "$"
+    "lock":   "$",
+    "empty":  " ",
+    "ac":     "O",
+    "notac":  "X",
+    "none":   "o"
 }

lib/commands/list.js

@@ -68,8 +68,8 @@ cmd.handler = function(argv) {
       if (problem.starred) ++stat.starred;
 
       log.printf('%s %s %s [%3d] %-60s %-6s (%.2f %%)',
-          (problem.starred ? chalk.yellow(icon.like) : icon.none),
-          (problem.locked ? chalk.red(icon.lock) : icon.none),
+          (problem.starred ? chalk.yellow(icon.like) : icon.empty),
+          (problem.locked ? chalk.red(icon.lock) : icon.empty),
           h.prettyState(problem.state),
           problem.fid,
           problem.name,

lib/commands/show.js

@@ -140,7 +140,7 @@ function showProblem(problem, argv) {
   }
 
   log.printf('[%d] %s %s', problem.fid, problem.name,
-      (problem.starred ? chalk.yellow(icon.like) : icon.none));
+      (problem.starred ? chalk.yellow(icon.like) : icon.empty));
   log.info();
   log.info(chalk.underline(problem.link));
   if (argv.extra) {

lib/commands/stat.js

@@ -4,6 +4,7 @@ var sprintf = require('sprintf-js').sprintf;
 var _ = require('underscore');
 
 var chalk = require('../chalk');
+var icon = require('../icon');
 var log = require('../log');
 var core = require('../core');
 var session = require('../session');
@@ -79,18 +80,12 @@ function showProgress(problems) {
   printLine('Hard', stats.hard.ac, stats.hard.all);
 }
 
-const CHARS = {
-  ac:    h.isWindows() ? 'O ' : '▣ ',
-  notac: h.isWindows() ? 'X ' : '▤ ',
-  none:  h.isWindows() ? 'o ' : '⬚ ',
-};
-
 function showGraph(problems) {
   const ICONS = {
-    ac:    chalk.green(CHARS.ac),
-    notac: chalk.red(CHARS.notac),
-    none:  chalk.gray(CHARS.none),
-    empty: '  '
+    ac:    chalk.green(icon.ac),
+    notac: chalk.red(icon.notac),
+    none:  chalk.gray(icon.none),
+    empty: icon.empty
   };
 
   // row header is 4 bytes
@@ -101,9 +96,9 @@ function showGraph(problems) {
   if (groups > 5) groups = 5;
 
   const header = _.range(groups)
-    .map(x => sprintf('%5d%18d', x * 10 + 1, x * 10 + 10))
+    .map(x => sprintf('%4d%18d', x * 10 + 1, x * 10 + 10))
     .join('');
-  log.info('    ' + header);
+  log.info('     ' + header);
 
   const graph = [];
   for (let problem of problems)
@@ -112,33 +107,33 @@ function showGraph(problems) {
   let line = [sprintf(' %03d', 0)];
   for (let i = 1, n = graph.length; i <= n; ++i) {
     // padding before group
-    if (i % 10 === 1) line.push('   ');
+    if (i % 10 === 1) line.push(' ');
 
     line.push(graph[i] || ICONS.empty);
 
     // time to start new row
     if (i % (10 * groups) === 0 || i === n) {
-      log.info(line.join(''));
+      log.info(line.join(' '));
       line = [sprintf(' %03d', i)];
     }
   }
 
   log.info();
   log.printf('%7s%s%3s%s%3s%s',
-      ' ', ICONS.ac + chalk.green(' Accepted'),
-      ' ', ICONS.notac + chalk.red(' Not Accepted'),
-      ' ', ICONS.none + ' Remaining');
+      ' ', ICONS.ac + chalk.green('  Accepted'),
+      ' ', ICONS.notac + chalk.red('  Not Accepted'),
+      ' ', ICONS.none + '  Remaining');
 }
 
 function showCal() {
   const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
   const WEEKDAYS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
   const ICONS = [
-    CHARS.none,
-    chalk.sprint(CHARS.ac, '#ffffcc'),
-    chalk.sprint(CHARS.ac, '#ccff66'),
-    chalk.sprint(CHARS.ac, '#66cc33'),
-    chalk.sprint(CHARS.ac, '#00ff00')
+    icon.none,
+    chalk.white(icon.ac),
+    chalk.green(icon.ac),
+    chalk.yellow(icon.ac),
+    chalk.red(icon.ac)
   ];
 
   const N_MONTHS = 12;
@@ -192,15 +187,15 @@ function showCal() {
       if (idx === 0 && d.month() % 2) icon = chalk.gray(icon);
       line.push(icon);
     }
-    log.info(line.join(''));
+    log.info(line.join(' '));
   }
 
   log.info();
-  log.printf('%7s%s%3s%s%3s%s%3s%s',
-    ' ', ICONS[1] + ' 1~5',
-    ' ', ICONS[2] + ' 6~10',
-    ' ', ICONS[3] + ' 11~15',
-    ' ', ICONS[4] + ' 16+');
+  log.printf('%8s%s%3s%s%3s%s%3s%s',
+    ' ', ICONS[1] + '  1~5',
+    ' ', ICONS[2] + '  6~10',
+    ' ', ICONS[3] + '  11~15',
+    ' ', ICONS[4] + '  16+');
 }
 
 cmd.handler = function(argv) {

lib/icon.js

@@ -9,7 +9,10 @@ const icons = {
   like:   '★',
   unlike: '☆',
   lock:   '🔒',
-  none:   ' ',
+  empty:  ' ',
+  ac:     '▣',
+  notac:  '▤',
+  none:   '⬚',
 
   themes: new Map()
 };